git.iko.soy/unity8
on xenial help sign in
Converge on UNITY_TESTING=1 envvar
88119ddMichał Sawicz
plugins/Wizard/PageList.cpp+1−1
compare with xenial
unifiedsplit
@@ -45,7 +45,7 @@ PageList::PageList(QObject *parent)
45 QSet<QString> disabledPages;
45 QSet<QString> disabledPages;
46 QStringList dataDirs;
46 QStringList dataDirs;
47
47
48− if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
48+ if (!isRunningInstalled() && getenv("UNITY_TESTING") == nullptr) {
49 dataDirs = QStringList() << qmlDirectory();
49 dataDirs = QStringList() << qmlDirectory();
50 } else {
50 } else {
51 dataDirs = shellDataDirs();
51 dataDirs = shellDataDirs();
tests/plugins/Utils/timeformattertest.cpp−10
@@ -45,16 +45,6 @@ private:
45 }
45 }
46
46
47private Q_SLOTS:
47private Q_SLOTS:
48− void initTestCase()
49− {
50− setenv("UNITY_TEST_ENV", "1", 1);
51− }
52−
53− void cleanupTestCase()
54− {
55− unsetenv("UNITY_TEST_ENV");
56− }
57−
58 void testTimeFormatter_Format_data() { addTestData(QList<int>() << 0); }
48 void testTimeFormatter_Format_data() { addTestData(QList<int>() << 0); }
59 void testTimeFormatter_Format()
49 void testTimeFormatter_Format()
60 {
50 {
tests/plugins/Wizard/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_executable(tst-wizard-pagelist
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
9)
9)
10qt5_use_modules(tst-wizard-pagelist Core Qml Test)
10qt5_use_modules(tst-wizard-pagelist Core Qml Test)
11−add_test(NAME wizardpagelisttest COMMAND env UNITY_TEST_ENV=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-wizard-pagelist)
11+add_test(NAME wizardpagelisttest COMMAND env UNITY_TESTING=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-wizard-pagelist)
12
12
13add_executable(tst-wizard-system
13add_executable(tst-wizard-system
14 tst_system.cpp
14 tst_system.cpp