[meta-qt5] [PATCH v3 0/3] Add ptest for qtdeclarative and qtxmlpatterns

[meta-qt5] [PATCH v3 0/3] Add ptest for qtdeclarative and qtxmlpatterns

[Huang Qiyu]

1) Add 'qt5-ptest.inc' for qt5 ptest
2) Add ptest for qtxmlpatterns by using provided testsuite.
3) Add ptest for qtdeclarative by using provided testsuite.


 recipes-qt/qt5/qt5-ptest.inc           | 61 ++++++++++++++++++++++++++++++++++
 recipes-qt/qt5/qtdeclarative/run-ptest |  5 +++
 recipes-qt/qt5/qtdeclarative_git.bb    |  1 +
 recipes-qt/qt5/qtxmlpatterns/run-ptest |  6 ++++
 recipes-qt/qt5/qtxmlpatterns_git.bb    |  2 ++
 5 files changed, 75 insertions(+)
 create mode 100644 recipes-qt/qt5/qt5-ptest.inc
 create mode 100644 recipes-qt/qt5/qtdeclarative/run-ptest
 create mode 100644 recipes-qt/qt5/qtxmlpatterns/run-ptest

-- 
2.7.4

[meta-qt5] [PATCH v3 1/3] qt5: add qt5-ptest.inc

[Huang Qiyu]

Add qt5-ptest.inc file for qt ptest related tasks
    1)	Rewrite do_compile_ptest task for qt
    2)	Add new do_compile_ptest_base and task do_install_ptest
    3)	Write do_populate_sysroot_append to resolve do_compile_ptest_base problem in yocto2.3
    The compile error log is shown as follow:
    cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o Makefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/git/tests/auto/auto.pro ) && make -f Makefile
    Project ERROR: Could not find feature xml-schema.
    Makefile:42: recipe for target 'sub-auto-make_first' failed

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
 recipes-qt/qt5/qt5-ptest.inc | 61 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 recipes-qt/qt5/qt5-ptest.inc

diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc
new file mode 100644
index 0000000..da0b65a
--- /dev/null
+++ b/recipes-qt/qt5/qt5-ptest.inc
@@ -0,0 +1,61 @@
+SRC_URI += "file://run-ptest"
+
+inherit ptest
+
+addtask do_populate_sysroot after do_install before do_compile_ptest_base
+deltask do_compile_ptest_base
+addtask do_compile_ptest_base after do_populate_sysroot before do_install_ptest
+addtask do_install_ptest after do_compile_ptest_base before do_package
+
+do_compile_ptest() {
+    cd ${S}/tests
+    qmake -o Makefile tests.pro
+    oe_runmake
+}
+
+do_populate_sysroot_append() {
+    workdir = d.getVar('WORKDIR')
+    srcdir = workdir + '/sysroot-destdir/usr/'
+    destdir = workdir + '/recipe-sysroot/usr/'
+    
+    def copyFiles(sourceDir, targetDir, filelist):
+        for file in os.listdir(sourceDir):
+            sourceFile = os.path.join(sourceDir,  file)
+            targetFile = os.path.join(targetDir,  file)
+            filelist.append(targetFile)    #record the file list
+            if os.path.isfile(sourceFile):
+                if not os.path.exists(targetDir):
+                    os.makedirs(targetDir)
+                if not os.path.exists(targetFile) or(os.path.exists(targetFile) and (os.path.getsize(targetFile) != os.path.getsize(sourceFile))):
+                        open(targetFile, "wb").write(open(sourceFile, "rb").read())
+            if os.path.isdir(sourceFile):
+                First_Directory = False
+                copyFiles(sourceFile, targetFile, filelist)
+    
+    Tmpfilelist = []
+    copyFiles(srcdir, destdir, Tmpfilelist)
+    
+    fp=open(workdir + '/filelist', 'w')
+    for i in Tmpfilelist:
+        fp.write(i)
+        fp.write("\n")
+    fp.close()
+}
+
+fakeroot do_install_ptest() {
+    mkdir -p ${D}${PTEST_PATH}
+    t=${D}${PTEST_PATH}
+    for var in ` find ${S}/tests/auto/ -name tst_*`; do
+        if [ -z ` echo ${var##*/} | grep '\.'` ]; then
+            echo ${var##*/} >> ${t}/tst_list
+            install -m 0644  ${var} ${t}
+        fi
+    done
+    for file in `cat ${WORKDIR}/filelist`; do
+       if [ -f $file ]; then
+           rm -f $file
+       fi
+    done 
+    rm -f ${WORKDIR}/filelist
+}
+
-- 
2.7.4

[meta-qt5] [PATCH v3 2/3] qtxmlpatterns: add ptest

[Huang Qiyu]

Add ptest for qttools by using provided testsuite in qtxmlpatterns.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
 recipes-qt/qt5/qtxmlpatterns/run-ptest | 6 ++++++
 recipes-qt/qt5/qtxmlpatterns_git.bb    | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 recipes-qt/qt5/qtxmlpatterns/run-ptest

diff --git a/recipes-qt/qt5/qtxmlpatterns/run-ptest b/recipes-qt/qt5/qtxmlpatterns/run-ptest
new file mode 100644
index 0000000..044f834
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns/run-ptest
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for x in ` awk '{print $1}' tst_list `;do
+    ./${x};
+done
+
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index c7efaf3..9333be0 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,5 +1,6 @@
 require qt5.inc
 require qt5-git.inc
+require qt5-ptest.inc
 
 LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
@@ -19,3 +20,4 @@ DEPENDS += "qtbase"
 SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74"
 
 BBCLASSEXTEND =+ "native nativesdk"
+
-- 
2.7.4

[meta-qt5] [PATCH v3 3/3] qtdeclarative: add ptest

[Huang Qiyu]

Add ptest for qttools by using provided testsuite in qtdeclarative.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
 recipes-qt/qt5/qtdeclarative/run-ptest | 5 +++++
 recipes-qt/qt5/qtdeclarative_git.bb    | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 recipes-qt/qt5/qtdeclarative/run-ptest

diff --git a/recipes-qt/qt5/qtdeclarative/run-ptest b/recipes-qt/qt5/qtdeclarative/run-ptest
new file mode 100644
index 0000000..6c3f522
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for x in ` awk '{print $1}' tst_list `;do
+    ./${x};
+done
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a620a00..bb0a605 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,5 +1,6 @@
 require qt5.inc
 require qt5-git.inc
+require qt5-ptest.inc
 
 LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
-- 
2.7.4

Re: [meta-qt5] [PATCH v3 1/3] qt5: add qt5-ptest.inc

[Martin Jansa]

This breaks qtxmlpatterns-native build as shown in:
http://errors.yoctoproject.org/Errors/Details/147039/

On Fri, Jun 30, 2017 at 7:47 AM, Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
wrote:

> Add qt5-ptest.inc file for qt ptest related tasks
>     1)  Rewrite do_compile_ptest task for qt
>     2)  Add new do_compile_ptest_base and task do_install_ptest
>     3)  Write do_populate_sysroot_append to resolve do_compile_ptest_base
> problem in yocto2.3
>     The compile error log is shown as follow:
>     cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/
> work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.
> 0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o
> Makefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-
> poky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/git/tests/auto/
> auto.pro ) && make -f Makefile
>     Project ERROR: Could not find feature xml-schema.
>     Makefile:42: recipe for target 'sub-auto-make_first' failed
>
> Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
> ---
>  recipes-qt/qt5/qt5-ptest.inc | 61 ++++++++++++++++++++++++++++++
> ++++++++++++++
>  1 file changed, 61 insertions(+)
>  create mode 100644 recipes-qt/qt5/qt5-ptest.inc
>
> diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc
> new file mode 100644
> index 0000000..da0b65a
> --- /dev/null
> +++ b/recipes-qt/qt5/qt5-ptest.inc
> @@ -0,0 +1,61 @@
> +SRC_URI += "file://run-ptest"
> +
> +inherit ptest
> +
> +addtask do_populate_sysroot after do_install before do_compile_ptest_base
> +deltask do_compile_ptest_base
> +addtask do_compile_ptest_base after do_populate_sysroot before
> do_install_ptest
> +addtask do_install_ptest after do_compile_ptest_base before do_package
> +
> +do_compile_ptest() {
> +    cd ${S}/tests
> +    qmake -o Makefile tests.pro
> +    oe_runmake
> +}
> +
> +do_populate_sysroot_append() {
> +    workdir = d.getVar('WORKDIR')
> +    srcdir = workdir + '/sysroot-destdir/usr/'
> +    destdir = workdir + '/recipe-sysroot/usr/'
> +
> +    def copyFiles(sourceDir, targetDir, filelist):
> +        for file in os.listdir(sourceDir):
> +            sourceFile = os.path.join(sourceDir,  file)
> +            targetFile = os.path.join(targetDir,  file)
> +            filelist.append(targetFile)    #record the file list
> +            if os.path.isfile(sourceFile):
> +                if not os.path.exists(targetDir):
> +                    os.makedirs(targetDir)
> +                if not os.path.exists(targetFile)
> or(os.path.exists(targetFile) and (os.path.getsize(targetFile) !=
> os.path.getsize(sourceFile))):
> +                        open(targetFile, "wb").write(open(sourceFile,
> "rb").read())
> +            if os.path.isdir(sourceFile):
> +                First_Directory = False
> +                copyFiles(sourceFile, targetFile, filelist)
> +
> +    Tmpfilelist = []
> +    copyFiles(srcdir, destdir, Tmpfilelist)
> +
> +    fp=open(workdir + '/filelist', 'w')
> +    for i in Tmpfilelist:
> +        fp.write(i)
> +        fp.write("\n")
> +    fp.close()
> +}
> +
> +fakeroot do_install_ptest() {
> +    mkdir -p ${D}${PTEST_PATH}
> +    t=${D}${PTEST_PATH}
> +    for var in ` find ${S}/tests/auto/ -name tst_*`; do
> +        if [ -z ` echo ${var##*/} | grep '\.'` ]; then
> +            echo ${var##*/} >> ${t}/tst_list
> +            install -m 0644  ${var} ${t}
> +        fi
> +    done
> +    for file in `cat ${WORKDIR}/filelist`; do
> +       if [ -f $file ]; then
> +           rm -f $file
> +       fi
> +    done
> +    rm -f ${WORKDIR}/filelist
> +}
> +
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>