[oe] [meta-qt5] [PATCH] qtbase: add ptest

[Martin Jansa]

Fails to build here:
http://errors.yoctoproject.org/Errors/Details/148218/

On Fri, Jul 21, 2017 at 1:35 PM, Martin Jansa <martin.jansa at gmail.com>
wrote:

> Dear Huang,
>
> I'm sorry other ptest related changes were merged, but not this one. I've
> added it to master-next now.
>
> On Fri, Jul 21, 2017 at 11:41 AM, Huang, Qiyu <huangqy.fnst at cn.fujitsu.com
> > wrote:
>
>> Dear Martin
>>
>>
>>
>> I have searched in the git log,and it was really not be mergerd.Could you
>> please ensure it?
>>
>>
>>
>> huangqy
>>
>>
>>
>> *From:* Martin Jansa [mailto:martin.jansa at gmail.com]
>> *Sent:* Friday, July 21, 2017 4:48 PM
>> *To:* Huang, Qiyu <huangqy.fnst at cn.fujitsu.com>
>> *Cc:* openembedded-devel at lists.openembedded.org
>> *Subject:* Re: [oe] [meta-qt5] [PATCH] qtbase: add ptest
>>
>>
>>
>> It was merged last week, why are you pinging this?
>>
>>
>>
>> On Fri, Jul 21, 2017 at 9:01 AM, Huang, Qiyu <huangqy.fnst at cn.fujitsu.com>
>> wrote:
>>
>> ping
>>
>> > -----Original Message-----
>> > From: Huang, Qiyu
>> > Sent: Friday, June 09, 2017 9:06 AM
>> > To: openembedded-devel at lists.openembedded.org
>> > Cc: Huang, Qiyu <huangqy.fnst at cn.fujitsu.com>
>> > Subject: [oe] [meta-qt5] [PATCH] qtbase: add ptest
>> >
>>
>> > Add ptest for qtbase  by using provided testsuite.
>> >
>> > Signed-off-by: Huang Qiyu <huangqy.fnst at cn.fujitsu.com>
>> > ---
>> >  .../0001-Delete-qlonglong-and-qulonglong.patch     | 28
>> > ++++++++++++++++++++++
>> >  recipes-qt/qt5/qtbase/run-ptest                    |  6 +++++
>> >  recipes-qt/qt5/qtbase_git.bb                       | 17 ++++++++++++-
>> >  3 files changed, 50 insertions(+), 1 deletion(-)  create mode 100644
>> > recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch
>> >  create mode 100644 recipes-qt/qt5/qtbase/run-ptest
>> >
>> > diff --git a/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong
>> .patch
>> > b/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch
>> > new file mode 100644
>> > index 0000000..975cd28
>> > --- /dev/null
>> > +++ b/recipes-qt/qt5/qtbase/0001-Delete-qlonglong-and-qulonglong.patch
>> > @@ -0,0 +1,28 @@
>> > +From c67a4af2e5db4c1e2213961e6392b59affd1959f Mon Sep 17 00:00:00
>> > 2001
>> > +From: Huang Qiyu <huangqy.fnst at cn.fujitsu.com>
>> > +Date: Wed, 7 Jun 2017 21:00:49 +0900
>> > +Subject: [PATCH] Delete qlonglong and qulonglong
>> > +
>> > +Signed-off-by: Huang Qiyu <huangqy.fnst at cn.fujitsu.com>
>> > +---
>> > + tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 --
>> > + 1 file changed, 2 deletions(-)
>> > +
>> > +diff --git
>>
>> > +a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
>> > +b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
>>
>> > +index 09458bd..59a120e 100644
>> > +--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
>> > ++++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
>> > +@@ -5,10 +5,8 @@ SUBDIRS=\
>> > +     char32_t \
>> > +     int \
>> > +     long \
>> > +-    qlonglong \
>> > +     qptrdiff \
>> > +     quintptr \
>> > +-    qulonglong \
>> > +     schar \
>> > +     short \
>> > +     uchar \
>> > +--
>> > +2.7.4
>> > +
>> > diff --git a/recipes-qt/qt5/qtbase/run-ptest
>> b/recipes-qt/qt5/qtbase/run-ptest
>> > new file mode 100644 index 0000000..044f834
>> > --- /dev/null
>> > +++ b/recipes-qt/qt5/qtbase/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/qtbase_git.bb b/recipes-qt/qt5/
>> qtbase_git.bb index
>> > 27d0de1..39fc272 100644
>> > --- a/recipes-qt/qt5/qtbase_git.bb
>> > +++ b/recipes-qt/qt5/qtbase_git.bb
>> > @@ -23,8 +23,12 @@ SRC_URI += "\
>> >      file://0005-configure-bump-path-length-from-256-to-512-chara
>> cter.patch
>> > \
>> >      file://0009-Disable-all-unknown-features-instead-of-erroring
>> -out.patch \
>> >
>> > file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
>> > \
>> > +    file://0001-Delete-qlonglong-and-qulonglong.patch \
>> > +    file://run-ptest \
>> >  "
>> >
>> > +inherit ptest
>> > +
>> >  # only for target qtbase
>> >  SRC_URI += "\
>> >      file://0008-configure-paths-for-target-qmake-properly.patch \ @@
>> -48,7
>> > +52,7 @@ PACKAGECONFIG_DISTRO ?= ""
>> >  PACKAGECONFIG_RELEASE ?= "release"
>> >  # This is in qt5.inc, because qtwebkit-examples are using it to enable
>> > ca-certificates dependency  # PACKAGECONFIG_OPENSSL ?= "openssl"
>> > -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype"
>> > +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype
>> > tests"
>> >
>> >  PACKAGECONFIG ?= " \
>> >      ${PACKAGECONFIG_RELEASE} \
>> > @@ -170,6 +174,17 @@ do_configure() {
>> >          ${QT_CONFIG_FLAGS}
>> >  }
>> >
>> > +fakeroot do_install_ptest() {
>> > +    mkdir -p ${D}${PTEST_PATH}
>> > +    t=${D}${PTEST_PATH}
>> > +    for var in ` find ${B}/tests/auto/ -name tst_*`; do
>> > +        if [ not ` echo ${var##*/} | grep '\.'` ]; then
>> > +            echo ${var##*/} >> ${t}/tst_list
>> > +            install -m 0644 ${var} ${t}
>> > +        fi
>> > +    done
>> > +}
>> > +
>> >  do_install_append() {
>> >      # Avoid qmake error "Cannot read
>> > [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or
>> directory"
>> >      touch
>> > ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri
>> > --
>> > 2.7.4
>>
>>
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
>>
>
>