git.iko.soy/unity8
on xenial help sign in
PageList only wants testing env in the unit test.
0d1e071Michał 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_TESTING") == nullptr) {
48+ if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
49 dataDirs = QStringList() << qmlDirectory();
49 dataDirs = QStringList() << qmlDirectory();
50 } else {
50 } else {
51 dataDirs = shellDataDirs();
51 dataDirs = shellDataDirs();
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_unity8_unittest(WizardPageList tst-wizard-pagelist)
11+add_unity8_unittest(WizardPageList tst-wizard-pagelist ENVIRONMENT WIZARD_TESTING=1)
12
12
13add_executable(tst-wizard-system
13add_executable(tst-wizard-system
14 tst_system.cpp
14 tst_system.cpp