Skip to content

Commit 1f6b6b3

Browse files
committed
tests: Update Configuration test to use placeholder string in env. variable
1 parent 0f6de43 commit 1f6b6b3

6 files changed

+9
-4
lines changed

Testing/Launcher/App4ConfigureLauncherTest-expected-buildtree-settings.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(CTKAPPLAUNCHER_PATHS "1\\path=<APPLAUNCHER_DIR>/dog
77
2\\path=<APPLAUNCHER_DIR>/cat
88
size=2")
99
set(CTKAPPLAUNCHER_ENVVARS "BAR=NONE
10+
PLACEHOLDER=build-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>
1011
")
1112
set(CTKAPPLAUNCHER_ADDITIONAL_PATH_ENVVARS "PYTHONPATH,QT_PLUGIN_PATH")
1213
set(CTKAPPLAUNCHER_ADDITIONAL_PATHS "
@@ -18,4 +19,3 @@ size=1
1819
[QT_PLUGIN_PATH]
1920
1\\path=<APPLAUNCHER_DIR>/build/libexec/qt
2021
size=1")
21-

Testing/Launcher/App4ConfigureLauncherTest-expected-installtree-settings.cmake.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(CTKAPPLAUNCHER_PATHS "1\\path=<APPLAUNCHER_DIR>/cow
77
2\\path=<APPLAUNCHER_DIR>/pig
88
size=2")
99
set(CTKAPPLAUNCHER_ENVVARS "BAR=ASSOCIATION
10+
PLACEHOLDER=install-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>
1011
")
1112
set(CTKAPPLAUNCHER_ADDITIONAL_PATH_ENVVARS "PYTHONPATH,QT_PLUGIN_PATH")
1213
set(CTKAPPLAUNCHER_ADDITIONAL_PATHS "

Testing/Launcher/App4ConfigureLauncherTest/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ ctkAppLauncherConfigure(
3939
PATHS_INSTALLED "<APPLAUNCHER_DIR>/cow;<APPLAUNCHER_DIR>/pig"
4040
LIBRARY_PATHS_BUILD "<APPLAUNCHER_DIR>/build/lib"
4141
LIBRARY_PATHS_INSTALLED "<APPLAUNCHER_DIR>/lib"
42-
ENVVARS_BUILD "BAR=NONE"
43-
ENVVARS_INSTALLED "BAR=ASSOCIATION"
42+
ENVVARS_BUILD "BAR=NONE" "PLACEHOLDER=build-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>"
43+
ENVVARS_INSTALLED "BAR=ASSOCIATION" "PLACEHOLDER=install-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>"
4444
ADDITIONAL_PATH_ENVVARS_BUILD "PYTHONPATH;QT_PLUGIN_PATH"
4545
ADDITIONAL_PATH_ENVVARS_INSTALLED "PYTHONPATH;QT_PLUGIN_PATH"
4646
ADDITIONAL_PATH_ENVVARS_PREFIX TEST_

Testing/Launcher/App4ConfigureLauncherTestLauncherSettings.ini.expected.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ size=2
2929

3030
[EnvironmentVariables]
3131
BAR=NONE
32+
PLACEHOLDER=build-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>
3233

3334

3435

Testing/Launcher/App4ConfigureLauncherTestLauncherSettingsToInstall.ini.expected.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ size=2
2929

3030
[EnvironmentVariables]
3131
BAR=ASSOCIATION
32+
PLACEHOLDER=install-<APPLAUNCHER_DIR>-<APPLAUNCHER_NAME>
3233

3334

3435

Testing/Launcher/ConfiguredAppLauncher-ConfigurationContents.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ function(compare_files ACTUAL EXPECTED)
99
string(CONFIGURE "${expected}" expected @ONLY)
1010
string(STRIP "${expected}" expected)
1111
if(NOT "${actual}" STREQUAL "${expected}")
12-
message(FATAL_ERROR "Content validation of '${ACTUAL}' failed:
12+
message(FATAL_ERROR "Content validation failed:
13+
ACTUAL: ${ACTUAL}
14+
EXPECTED: ${EXPECTED}
1315
1416
--
1517
expected content:

0 commit comments

Comments
 (0)