Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
unittest paths fixed in tests.xml
depending on Qt version the path is different, so the tests.xml file can
be used in packages build for Qt4 and Qt5.

[qa] unittest paths fixed in tests.xml depending on Qt version
  • Loading branch information
Reto Zingg committed Sep 25, 2013
1 parent 62a51bc commit 4e8e767
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tests/gen-tests-xml.sh
@@ -1,6 +1,7 @@
#!/bin/bash

TESTDIR=`dirname $0`
INSTALL_PATH=$1
DOMAIN="Application Framework"
FEATURE="MeeGo Touch UI Framework"
TYPE="Functional"
Expand All @@ -22,7 +23,7 @@ for TEST in `ls -d ?t_*`; do
fi

TESTCASE_TEMPLATE="<case name=\"$TEST\" description=\"$TEST\" requirement=\"\" timeout=\"300\" insignificant=\"$INSIGNIFICANT\">
<step expected_result=\"0\">/usr/lib/libmlocale-tests/$TEST</step>
<step expected_result=\"0\">$INSTALL_PATH/$TEST</step>
</case>
"

Expand Down
5 changes: 4 additions & 1 deletion tests/shell.pri
@@ -1,4 +1,7 @@
shell_scripts.commands += $$PWD/gen-tests-xml.sh > $$OUT_PWD/tests.xml
equals(QT_MAJOR_VERSION, 4): ml_unittest_install_path = $$[QT_INSTALL_LIBS]/libmlocale-tests
equals(QT_MAJOR_VERSION, 5): ml_unittest_install_path = $$[QT_INSTALL_LIBS]/libmlocale-tests5

shell_scripts.commands += $$PWD/gen-tests-xml.sh $${ml_unittest_install_path} > $$OUT_PWD/tests.xml
shell_scripts.files += $$OUT_PWD/tests.xml
shell_scripts.CONFIG += no_check_exist

Expand Down

0 comments on commit 4e8e767

Please sign in to comment.