diff options
| author | Kai Kang <kai.kang@windriver.com> | 2021-02-01 08:33:35 +0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-02-08 17:40:32 +0100 |
| commit | 23f7a1c8eabaf1beb80cc6214954c0e1751c4cbd (patch) | |
| tree | edaef0344c207b76cd301a1e067fd80fcd6454c3 | |
| parent | 9029ee42db92464fc5081ef8e3ab96c2d35adb28 (diff) | |
| download | meta-qt5-23f7a1c8eabaf1beb80cc6214954c0e1751c4cbd.tar.gz | |
qtdeclarative: overwrite do_install_ptest
Overwrite and extend do_install_ptest for qtdeclarative. It fixes
runtime errors:
| FAIL! : TestQmllint::initTestCase() '!m_dataDirectory.isEmpty()'
returned FALSE. ('data' directory not found)
With this change, more tests have been run and the results are better:
passed: 993 -> 2318
failed: 182 -> 113
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3ff69d60..91e239f7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -27,6 +27,25 @@ PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" | |||
| 27 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" | 27 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" |
| 28 | PACKAGECONFIG[static] = ",,qtdeclarative-native" | 28 | PACKAGECONFIG[static] = ",,qtdeclarative-native" |
| 29 | 29 | ||
| 30 | do_install_ptest() { | ||
| 31 | mkdir -p ${D}${PTEST_PATH} | ||
| 32 | for var in `find ${B}/tests/auto/ -name tst_*`; do | ||
| 33 | case=$(basename ${var}) | ||
| 34 | if [ -z `echo ${case} | grep '\.'` ]; then | ||
| 35 | dname=$(dirname ${var}) | ||
| 36 | pdir=$(basename ${dname}) | ||
| 37 | echo ${pdir}/${case} >> ${D}${PTEST_PATH}/tst_list | ||
| 38 | |||
| 39 | mkdir ${D}${PTEST_PATH}/${pdir} | ||
| 40 | install -m 0744 ${var} ${D}${PTEST_PATH}/${pdir} | ||
| 41 | data_dir=${S}/${dname##${B}}/data | ||
| 42 | if [ -d ${data_dir} ]; then | ||
| 43 | cp -r ${data_dir} ${D}${PTEST_PATH}/${pdir} | ||
| 44 | fi | ||
| 45 | fi | ||
| 46 | done | ||
| 47 | } | ||
| 48 | |||
| 30 | do_install_append_class-nativesdk() { | 49 | do_install_append_class-nativesdk() { |
| 31 | # qml files not needed in nativesdk | 50 | # qml files not needed in nativesdk |
| 32 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 51 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
