diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-31 14:10:26 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-01 00:45:20 +0100 |
commit | 9e8b889549c485c19fd8354ce39ea1af2701d5d2 (patch) | |
tree | 3ffe6487e54b776151f11cc5df8cbe588d4f7cca /t | |
parent | 9b51236258594a7835e33aa5010bccb96c48984a (diff) |
Remove various unnecessary references to Pulse.
Prefer using the QTQA_ environment namespace over the PULSE_ namespace
for things which are not related to the Pulse CI tool.
The Pulse syntax still works, but is not preferred, with the exception
of a few Pulse-specific variables: PULSE_BASE_DIR, PULSE_PROJECT,
PULSE_STAGE, PULSE_BUILD_NUMBER, PULSE_BUILD_REASON.
Change-Id: If28077b455d3169ce7e45ec39dd37824e79c1c39
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 't')
44 files changed, 446 insertions, 446 deletions
diff --git a/t/01-test.t b/t/01-test.t index 6e901ad4..89bc087a 100644 --- a/t/01-test.t +++ b/t/01-test.t @@ -15,10 +15,10 @@ sub debug print STDERR @_ unless 1; } -sub clean_pulse_environment +sub clean_environment { foreach my $key (keys %ENV) { - if ($key =~ /^PULSE_/i) { + if ($key =~ /^(?:PULSE|QTQA)_/i) { delete $ENV{$key}; } } @@ -67,12 +67,12 @@ sub test_stage } - clean_pulse_environment; + clean_environment; - # Override PulseTest's default setting of base.dir so we get predictable output + # Override QtQATest's default setting of base.dir so we get predictable output $ENV{PULSE_BASE_DIR} = "BASE_DIR"; - # For this test case, force PulseTest to think we are in Pulse + # For this test case, force QtQATest to think we are in Pulse if ($confdir =~ /14_no_manual_overrides/) { $ENV{PULSE_BUILD_NUMBER} = "123"; $ENV{PULSE_BUILD_REASON} = "faked by test script"; @@ -80,7 +80,7 @@ sub test_stage debug " $project $stage:\n"; - my $test = PulseTest->new( + my $test = QtQATest->new( project => $project, stage => $stage, confdir => $confdir, diff --git a/t/02-test-production.t b/t/02-test-production.t index 2e7dc953..b9cdcbe9 100644 --- a/t/02-test-production.t +++ b/t/02-test-production.t @@ -12,10 +12,10 @@ use IO::Capture::Stdout; do "$FindBin::Bin/../test.pl" or die "do test.pl: $!"; -sub clean_pulse_environment +sub clean_environment { foreach my $key (keys %ENV) { - if ($key =~ /^PULSE_/i) { + if ($key =~ /^(?:PULSE|QTQA)_/i) { delete $ENV{$key}; } } @@ -28,13 +28,13 @@ sub test_stage my $project = $opts{project}; my $stage = $opts{stage}; - clean_pulse_environment; + clean_environment; # Pretend we are in Pulse to get as accurate as possible results. $ENV{PULSE_BUILD_NUMBER} = '123'; $ENV{PULSE_BUILD_REASON} = 'faked by test script'; - my $test = PulseTest->new( + my $test = QtQATest->new( project => $project, stage => $stage, confdir => $confdir, @@ -59,7 +59,7 @@ sub find_all_stages my $stages = $opts{stages}; $stages = {} unless $stages; - my $test = PulseTest->new; + my $test = QtQATest->new; my $stagedir = $test->_follow_symlinks("$dir/stages"); diff --git a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/linux-g++-32_Ubuntu_9.10_x86 b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/linux-g++-32_Ubuntu_9.10_x86 index 66e61dc5..e9164a67 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/linux-g++-32_Ubuntu_9.10_x86 +++ b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/linux-g++-32_Ubuntu_9.10_x86 @@ -1,15 +1,15 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' -PULSE_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' -PULSE_BULLSEYE_ENABLED=1 -PULSE_BULLSEYE_PUBLISH=1 -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_PLATFORM=linux-g++-32 -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_TESTR_BRANCH=master -PULSE_TESTS_TESTR=1 -PULSE_TESTS_TIMEOUT=900000 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_COVSELECT_ARGS PULSE_BULLSEYE_ENABLED PULSE_BULLSEYE_PUBLISH PULSE_INCREDIBUILD_ENABLED PULSE_PLATFORM PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_TESTR_BRANCH PULSE_TESTS_TESTR PULSE_TESTS_TIMEOUT +QTQA_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' +QTQA_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' +QTQA_BULLSEYE_ENABLED=1 +QTQA_BULLSEYE_PUBLISH=1 +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_PLATFORM=linux-g++-32 +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_TESTR_BRANCH=master +QTQA_TESTS_TESTR=1 +QTQA_TESTS_TIMEOUT=900000 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_COVSELECT_ARGS QTQA_BULLSEYE_ENABLED QTQA_BULLSEYE_PUBLISH QTQA_INCREDIBUILD_ENABLED QTQA_PLATFORM QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_TESTR_BRANCH QTQA_TESTS_TESTR QTQA_TESTS_TIMEOUT git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/mobility/mobility_pulse_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo5_armel b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo5_armel index dda3c596..61eca299 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo5_armel +++ b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo5_armel @@ -1,15 +1,15 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' -PULSE_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_MOBILITY_CONFIGURE_EXTRA_ARGS=-maemo5 -PULSE_PLATFORM=maemo5 -PULSE_QT_BRANCH=4.7 -PULSE_RUN_TESTS=0 -PULSE_TESTR_BRANCH=master -PULSE_TESTS_TESTR=1 -PULSE_TESTS_TIMEOUT=900000 -PULSE_XPLATFORM=maemo5 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_COVSELECT_ARGS PULSE_INCREDIBUILD_ENABLED PULSE_MOBILITY_CONFIGURE_EXTRA_ARGS PULSE_PLATFORM PULSE_QT_BRANCH PULSE_RUN_TESTS PULSE_TESTR_BRANCH PULSE_TESTS_TESTR PULSE_TESTS_TIMEOUT PULSE_XPLATFORM +QTQA_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' +QTQA_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_MOBILITY_CONFIGURE_EXTRA_ARGS=-maemo5 +QTQA_PLATFORM=maemo5 +QTQA_QT_BRANCH=4.7 +QTQA_RUN_TESTS=0 +QTQA_TESTR_BRANCH=master +QTQA_TESTS_TESTR=1 +QTQA_TESTS_TIMEOUT=900000 +QTQA_XPLATFORM=maemo5 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_COVSELECT_ARGS QTQA_INCREDIBUILD_ENABLED QTQA_MOBILITY_CONFIGURE_EXTRA_ARGS QTQA_PLATFORM QTQA_QT_BRANCH QTQA_RUN_TESTS QTQA_TESTR_BRANCH QTQA_TESTS_TESTR QTQA_TESTS_TIMEOUT QTQA_XPLATFORM git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/mobility/mobility_pulse_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo6_armel b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo6_armel index 5d9d03c0..1b33028d 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo6_armel +++ b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/maemo6_armel @@ -1,15 +1,15 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' -PULSE_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_MOBILITY_CONFIGURE_EXTRA_ARGS=-maemo6 -PULSE_PLATFORM=maemo6 -PULSE_QT_BRANCH=4.7 -PULSE_RUN_TESTS=0 -PULSE_TESTR_BRANCH=master -PULSE_TESTS_TESTR=1 -PULSE_TESTS_TIMEOUT=900000 -PULSE_XPLATFORM=maemo6 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_COVSELECT_ARGS PULSE_INCREDIBUILD_ENABLED PULSE_MOBILITY_CONFIGURE_EXTRA_ARGS PULSE_PLATFORM PULSE_QT_BRANCH PULSE_RUN_TESTS PULSE_TESTR_BRANCH PULSE_TESTS_TESTR PULSE_TESTS_TIMEOUT PULSE_XPLATFORM +QTQA_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' +QTQA_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_MOBILITY_CONFIGURE_EXTRA_ARGS=-maemo6 +QTQA_PLATFORM=maemo6 +QTQA_QT_BRANCH=4.7 +QTQA_RUN_TESTS=0 +QTQA_TESTR_BRANCH=master +QTQA_TESTS_TESTR=1 +QTQA_TESTS_TIMEOUT=900000 +QTQA_XPLATFORM=maemo6 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_COVSELECT_ARGS QTQA_INCREDIBUILD_ENABLED QTQA_MOBILITY_CONFIGURE_EXTRA_ARGS QTQA_PLATFORM QTQA_QT_BRANCH QTQA_RUN_TESTS QTQA_TESTR_BRANCH QTQA_TESTS_TESTR QTQA_TESTS_TIMEOUT QTQA_XPLATFORM git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/mobility/mobility_pulse_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/symbian-abld_3.1 b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/symbian-abld_3.1 index 148eed9d..edd96541 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/symbian-abld_3.1 +++ b/t/testdata/01_mixed_typical/expected/projects/Mobility/stages/symbian-abld_3.1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' -PULSE_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' -PULSE_INCREDIBUILD_ENABLED=0 -PULSE_MOBILITY_CONFIGURE_ARGS='-prefix BASE_DIR\_install -tests -examples -symbian-unfrozen' -PULSE_PLATFORM=win32-g++ -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_S60SDK_FORCEINSTALL=1 -PULSE_TESTR_BRANCH=master -PULSE_TESTR_EXTRA_MKSPEC=_winscw-udeb_3.1 -PULSE_TESTS_TESTR=1 -PULSE_TESTS_TIMEOUT=900000 -PULSE_TSS_INSTALL=0 -PULSE_XPLATFORM=symbian-abld +QTQA_BULLSEYE_COVC_ARGS='-t!tst_qgalleryfilter.cpp' +QTQA_BULLSEYE_COVSELECT_ARGS='-a '"'"'!/'"'"' '"'"'src/'"'"' '"'"'plugins/'"'"'' +QTQA_INCREDIBUILD_ENABLED=0 +QTQA_MOBILITY_CONFIGURE_ARGS='-prefix BASE_DIR\_install -tests -examples -symbian-unfrozen' +QTQA_PLATFORM=win32-g++ +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_S60SDK_FORCEINSTALL=1 +QTQA_TESTR_BRANCH=master +QTQA_TESTR_EXTRA_MKSPEC=_winscw-udeb_3.1 +QTQA_TESTS_TESTR=1 +QTQA_TESTS_TIMEOUT=900000 +QTQA_TSS_INSTALL=0 +QTQA_XPLATFORM=symbian-abld SYMBIANBUILD_DEPENDENCYOFF=1 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_COVSELECT_ARGS PULSE_INCREDIBUILD_ENABLED PULSE_MOBILITY_CONFIGURE_ARGS PULSE_PLATFORM PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_S60SDK_FORCEINSTALL PULSE_TESTR_BRANCH PULSE_TESTR_EXTRA_MKSPEC PULSE_TESTS_TESTR PULSE_TESTS_TIMEOUT PULSE_TSS_INSTALL PULSE_XPLATFORM SYMBIANBUILD_DEPENDENCYOFF +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_COVSELECT_ARGS QTQA_INCREDIBUILD_ENABLED QTQA_MOBILITY_CONFIGURE_ARGS QTQA_PLATFORM QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_S60SDK_FORCEINSTALL QTQA_TESTR_BRANCH QTQA_TESTR_EXTRA_MKSPEC QTQA_TESTS_TESTR QTQA_TESTS_TIMEOUT QTQA_TSS_INSTALL QTQA_XPLATFORM SYMBIANBUILD_DEPENDENCYOFF git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/mobility/mobility_pulse_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Qt-4.7-memory-leak-trial/stages/linux-g++-32_Ubuntu_9.10_x86_memory_leaks b/t/testdata/01_mixed_typical/expected/projects/Qt-4.7-memory-leak-trial/stages/linux-g++-32_Ubuntu_9.10_x86_memory_leaks index 085334d6..68949d83 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Qt-4.7-memory-leak-trial/stages/linux-g++-32_Ubuntu_9.10_x86_memory_leaks +++ b/t/testdata/01_mixed_typical/expected/projects/Qt-4.7-memory-leak-trial/stages/linux-g++-32_Ubuntu_9.10_x86_memory_leaks @@ -1,13 +1,13 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_CONFIGURE_ARGS='-no-qt3support -nomake examples -nomake demos -nokia-developer' -PULSE_CONFIGURE_EXTRA_ARGS='-silent -no-pch' -PULSE_MAKE_ARGS=-j30 -PULSE_MEMORY_LEAK_TESTS_ENABLED=1 -PULSE_PLATFORM=linux-g++-32 -PULSE_QT_FAST_HACKS=1 -PULSE_TESTR_BRANCH=qt-4.7-memory-leak-trial -PULSE_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 -PULSE_TESTS_ENABLED=0 -export PULSE_BASE_DIR PULSE_CONFIGURE_ARGS PULSE_CONFIGURE_EXTRA_ARGS PULSE_MAKE_ARGS PULSE_MEMORY_LEAK_TESTS_ENABLED PULSE_PLATFORM PULSE_QT_FAST_HACKS PULSE_TESTR_BRANCH PULSE_TESTR_MKSPEC PULSE_TESTS_ENABLED +QTQA_CONFIGURE_ARGS='-no-qt3support -nomake examples -nomake demos -nokia-developer' +QTQA_CONFIGURE_EXTRA_ARGS='-silent -no-pch' +QTQA_MAKE_ARGS=-j30 +QTQA_MEMORY_LEAK_TESTS_ENABLED=1 +QTQA_PLATFORM=linux-g++-32 +QTQA_QT_FAST_HACKS=1 +QTQA_TESTR_BRANCH=qt-4.7-memory-leak-trial +QTQA_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 +QTQA_TESTS_ENABLED=0 +export PULSE_BASE_DIR QTQA_CONFIGURE_ARGS QTQA_CONFIGURE_EXTRA_ARGS QTQA_MAKE_ARGS QTQA_MEMORY_LEAK_TESTS_ENABLED QTQA_PLATFORM QTQA_QT_FAST_HACKS QTQA_TESTR_BRANCH QTQA_TESTR_MKSPEC QTQA_TESTS_ENABLED git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/qt/qt_pulse_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/linux-g++-32_Ubuntu_9.10 b/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/linux-g++-32_Ubuntu_9.10 index 5a597fa9..1f821d17 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/linux-g++-32_Ubuntu_9.10 +++ b/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/linux-g++-32_Ubuntu_9.10 @@ -1,16 +1,16 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' -PULSE_BULLSEYE_ENABLED=0 -PULSE_BULLSEYE_PUBLISH=1 -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_PLATFORM=linux-g++-32 -PULSE_QMAKE_ARGS='CONFIG+=silent' -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_TESTR_BRANCH=creator-master -PULSE_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 -PULSE_TESTS_ENABLED=1 -PULSE_TESTS_TESTR=1 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_ENABLED PULSE_BULLSEYE_PUBLISH PULSE_INCREDIBUILD_ENABLED PULSE_PLATFORM PULSE_QMAKE_ARGS PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_TESTR_BRANCH PULSE_TESTR_MKSPEC PULSE_TESTS_ENABLED PULSE_TESTS_TESTR +QTQA_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' +QTQA_BULLSEYE_ENABLED=0 +QTQA_BULLSEYE_PUBLISH=1 +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_PLATFORM=linux-g++-32 +QTQA_QMAKE_ARGS='CONFIG+=silent' +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_TESTR_BRANCH=creator-master +QTQA_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 +QTQA_TESTS_ENABLED=1 +QTQA_TESTS_TESTR=1 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_ENABLED QTQA_BULLSEYE_PUBLISH QTQA_INCREDIBUILD_ENABLED QTQA_PLATFORM QTQA_QMAKE_ARGS QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_TESTR_BRANCH QTQA_TESTR_MKSPEC QTQA_TESTS_ENABLED QTQA_TESTS_TESTR git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/generic/qt_project_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/win32-msvc2008_Windows_7 b/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/win32-msvc2008_Windows_7 index c33e630a..49a61d4d 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/win32-msvc2008_Windows_7 +++ b/t/testdata/01_mixed_typical/expected/projects/Qt-Creator-master-4.7/stages/win32-msvc2008_Windows_7 @@ -1,14 +1,14 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' -PULSE_BULLSEYE_PUBLISH=1 -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_PLATFORM=win32-msvc2008 -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_TESTR_BRANCH=creator-master -PULSE_TESTR_MKSPEC=pulse_win32-msvc2008_windows_7 -PULSE_TESTS_ENABLED=1 -PULSE_TESTS_TESTR=1 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_PUBLISH PULSE_INCREDIBUILD_ENABLED PULSE_PLATFORM PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_TESTR_BRANCH PULSE_TESTR_MKSPEC PULSE_TESTS_ENABLED PULSE_TESTS_TESTR +QTQA_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' +QTQA_BULLSEYE_PUBLISH=1 +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_PLATFORM=win32-msvc2008 +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_TESTR_BRANCH=creator-master +QTQA_TESTR_MKSPEC=pulse_win32-msvc2008_windows_7 +QTQA_TESTS_ENABLED=1 +QTQA_TESTS_TESTR=1 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_PUBLISH QTQA_INCREDIBUILD_ENABLED QTQA_PLATFORM QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_TESTR_BRANCH QTQA_TESTR_MKSPEC QTQA_TESTS_ENABLED QTQA_TESTS_TESTR git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/generic/qt_project_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/linux-g++-32_Ubuntu_9.10 b/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/linux-g++-32_Ubuntu_9.10 index 91917fae..b7564860 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/linux-g++-32_Ubuntu_9.10 +++ b/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/linux-g++-32_Ubuntu_9.10 @@ -1,17 +1,17 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' -PULSE_BULLSEYE_ENABLED=0 -PULSE_BULLSEYE_PUBLISH=1 -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_PLATFORM=linux-g++-32 -PULSE_PROPERTY_WITH_DASH=value -PULSE_QMAKE_ARGS='CONFIG+=silent' -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_TESTR_BRANCH=qt3d-master -PULSE_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 -PULSE_TESTS_ENABLED=1 -PULSE_TESTS_TESTR=1 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_ENABLED PULSE_BULLSEYE_PUBLISH PULSE_INCREDIBUILD_ENABLED PULSE_PLATFORM PULSE_PROPERTY_WITH_DASH PULSE_QMAKE_ARGS PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_TESTR_BRANCH PULSE_TESTR_MKSPEC PULSE_TESTS_ENABLED PULSE_TESTS_TESTR +QTQA_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' +QTQA_BULLSEYE_ENABLED=0 +QTQA_BULLSEYE_PUBLISH=1 +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_PLATFORM=linux-g++-32 +QTQA_PROPERTY_WITH_DASH=value +QTQA_QMAKE_ARGS='CONFIG+=silent' +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_TESTR_BRANCH=qt3d-master +QTQA_TESTR_MKSPEC=pulse_linux-g++-32_ubuntu910 +QTQA_TESTS_ENABLED=1 +QTQA_TESTS_TESTR=1 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_ENABLED QTQA_BULLSEYE_PUBLISH QTQA_INCREDIBUILD_ENABLED QTQA_PLATFORM QTQA_PROPERTY_WITH_DASH QTQA_QMAKE_ARGS QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_TESTR_BRANCH QTQA_TESTR_MKSPEC QTQA_TESTS_ENABLED QTQA_TESTS_TESTR git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/generic/qt_project_test.pl diff --git a/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/win32-msvc2008_Windows_7 b/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/win32-msvc2008_Windows_7 index b5ee2e79..1c34623c 100644 --- a/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/win32-msvc2008_Windows_7 +++ b/t/testdata/01_mixed_typical/expected/projects/Qt3d/stages/win32-msvc2008_Windows_7 @@ -1,15 +1,15 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' -PULSE_BULLSEYE_PUBLISH=1 -PULSE_INCREDIBUILD_ENABLED=1 -PULSE_PLATFORM=win32-msvc2008 -PULSE_PROPERTY_WITH_DASH=value -PULSE_QT_BRANCH=4.7 -PULSE_QT_USE_BINPKG=1 -PULSE_TESTR_BRANCH=qt3d-master -PULSE_TESTR_MKSPEC=pulse_win32-msvc2008_windows_7 -PULSE_TESTS_ENABLED=1 -PULSE_TESTS_TESTR=1 -export PULSE_BASE_DIR PULSE_BULLSEYE_COVC_ARGS PULSE_BULLSEYE_PUBLISH PULSE_INCREDIBUILD_ENABLED PULSE_PLATFORM PULSE_PROPERTY_WITH_DASH PULSE_QT_BRANCH PULSE_QT_USE_BINPKG PULSE_TESTR_BRANCH PULSE_TESTR_MKSPEC PULSE_TESTS_ENABLED PULSE_TESTS_TESTR +QTQA_BULLSEYE_COVC_ARGS='-t!ExpressionEvaluator::evaluate_expression' +QTQA_BULLSEYE_PUBLISH=1 +QTQA_INCREDIBUILD_ENABLED=1 +QTQA_PLATFORM=win32-msvc2008 +QTQA_PROPERTY_WITH_DASH=value +QTQA_QT_BRANCH=4.7 +QTQA_QT_USE_BINPKG=1 +QTQA_TESTR_BRANCH=qt3d-master +QTQA_TESTR_MKSPEC=pulse_win32-msvc2008_windows_7 +QTQA_TESTS_ENABLED=1 +QTQA_TESTS_TESTR=1 +export PULSE_BASE_DIR QTQA_BULLSEYE_COVC_ARGS QTQA_BULLSEYE_PUBLISH QTQA_INCREDIBUILD_ENABLED QTQA_PLATFORM QTQA_PROPERTY_WITH_DASH QTQA_QT_BRANCH QTQA_QT_USE_BINPKG QTQA_TESTR_BRANCH QTQA_TESTR_MKSPEC QTQA_TESTS_ENABLED QTQA_TESTS_TESTR git clone qtgitreadonly:qa-dungeon/mainline.git _qadungeon perl _qadungeon/tests/generic/qt_project_test.pl diff --git a/t/testdata/02_property_substitution_simple/expected/projects/testproject/stages/teststage b/t/testdata/02_property_substitution_simple/expected/projects/testproject/stages/teststage index 6f430e19..753ed998 100644 --- a/t/testdata/02_property_substitution_simple/expected/projects/testproject/stages/teststage +++ b/t/testdata/02_property_substitution_simple/expected/projects/testproject/stages/teststage @@ -1,7 +1,7 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_SOURCE_PROPERTY='string from source property' -PULSE_USING_NONEXISTENT_PROPERTY='this should be empty: ""' -PULSE_USING_NONEXISTENT_PROPERTY_WITH_BACKSLASH='this should be empty: "\foo\bar"' -PULSE_USING_PROPERTY='This property uses another property: "string from source property"' -export PULSE_BASE_DIR PULSE_SOURCE_PROPERTY PULSE_USING_NONEXISTENT_PROPERTY PULSE_USING_NONEXISTENT_PROPERTY_WITH_BACKSLASH PULSE_USING_PROPERTY +QTQA_SOURCE_PROPERTY='string from source property' +QTQA_USING_NONEXISTENT_PROPERTY='this should be empty: ""' +QTQA_USING_NONEXISTENT_PROPERTY_WITH_BACKSLASH='this should be empty: "\foo\bar"' +QTQA_USING_PROPERTY='This property uses another property: "string from source property"' +export PULSE_BASE_DIR QTQA_SOURCE_PROPERTY QTQA_USING_NONEXISTENT_PROPERTY QTQA_USING_NONEXISTENT_PROPERTY_WITH_BACKSLASH QTQA_USING_PROPERTY testscript diff --git a/t/testdata/03_property_substitution_worstcase_order/expected/projects/testproject/stages/teststage b/t/testdata/03_property_substitution_worstcase_order/expected/projects/testproject/stages/teststage index 8af66468..169bc266 100644 --- a/t/testdata/03_property_substitution_worstcase_order/expected/projects/testproject/stages/teststage +++ b/t/testdata/03_property_substitution_worstcase_order/expected/projects/testproject/stages/teststage @@ -1,5 +1,5 @@ -PULSE_00_USING_PROPERTY='This property uses another property: "string from source property"' -PULSE_01_SOURCE_PROPERTY='string from source property' +QTQA_00_USING_PROPERTY='This property uses another property: "string from source property"' +QTQA_01_SOURCE_PROPERTY='string from source property' PULSE_BASE_DIR=BASE_DIR -export PULSE_00_USING_PROPERTY PULSE_01_SOURCE_PROPERTY PULSE_BASE_DIR +export QTQA_00_USING_PROPERTY QTQA_01_SOURCE_PROPERTY PULSE_BASE_DIR testscript diff --git a/t/testdata/04_property_substitution_many/expected/projects/testproject/stages/teststage b/t/testdata/04_property_substitution_many/expected/projects/testproject/stages/teststage index cd93a629..4fcf0162 100644 --- a/t/testdata/04_property_substitution_many/expected/projects/testproject/stages/teststage +++ b/t/testdata/04_property_substitution_many/expected/projects/testproject/stages/teststage @@ -1,13 +1,13 @@ -PULSE_00=value00 -PULSE_00_REFERENCES_BUNCH_OF_STUFF='all over the place: value01 value00 nested value:"value00 value02" value03 value05' -PULSE_01=value01 -PULSE_02=value02 -PULSE_03=value03 -PULSE_04=value04 -PULSE_05=value05 +QTQA_00=value00 +QTQA_00_REFERENCES_BUNCH_OF_STUFF='all over the place: value01 value00 nested value:"value00 value02" value03 value05' +QTQA_01=value01 +QTQA_02=value02 +QTQA_03=value03 +QTQA_04=value04 +QTQA_05=value05 PULSE_BASE_DIR=BASE_DIR -PULSE_REFERENCES_00_02='value:"value00 value02"' -PULSE_REFERENCES_REFERENCES_00_02_03='nested value:"value00 value02" value03' +QTQA_REFERENCES_00_02='value:"value00 value02"' +QTQA_REFERENCES_REFERENCES_00_02_03='nested value:"value00 value02" value03' ENV_USES_01='uses 01: value01' -export PULSE_00 PULSE_00_REFERENCES_BUNCH_OF_STUFF PULSE_01 PULSE_02 PULSE_03 PULSE_04 PULSE_05 PULSE_BASE_DIR PULSE_REFERENCES_00_02 PULSE_REFERENCES_REFERENCES_00_02_03 ENV_USES_01 +export QTQA_00 QTQA_00_REFERENCES_BUNCH_OF_STUFF QTQA_01 QTQA_02 QTQA_03 QTQA_04 QTQA_05 PULSE_BASE_DIR QTQA_REFERENCES_00_02 QTQA_REFERENCES_REFERENCES_00_02_03 ENV_USES_01 testscript diff --git a/t/testdata/05_property_substitution_escapecharacters/expected/projects/testproject/stages/teststage b/t/testdata/05_property_substitution_escapecharacters/expected/projects/testproject/stages/teststage index 32c310fc..226a6375 100644 --- a/t/testdata/05_property_substitution_escapecharacters/expected/projects/testproject/stages/teststage +++ b/t/testdata/05_property_substitution_escapecharacters/expected/projects/testproject/stages/teststage @@ -1,6 +1,6 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_NO_SUBSTITUTION='Here'"'"'s a thing: $(source_property) and backslash: `\'"'"' and dollar sign: $' -PULSE_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_SUBSTITUTION='here'"'"'s a thing: string from source property and again: string from source property and backslash: \ and dollar sign: $' -PULSE_SOURCE_PROPERTY='string from source property' -export PULSE_BASE_DIR PULSE_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_NO_SUBSTITUTION PULSE_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_SUBSTITUTION PULSE_SOURCE_PROPERTY +QTQA_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_NO_SUBSTITUTION='Here'"'"'s a thing: $(source_property) and backslash: `\'"'"' and dollar sign: $' +QTQA_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_SUBSTITUTION='here'"'"'s a thing: string from source property and again: string from source property and backslash: \ and dollar sign: $' +QTQA_SOURCE_PROPERTY='string from source property' +export PULSE_BASE_DIR QTQA_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_NO_SUBSTITUTION QTQA_PROPERTY_CONTAINING_ESCAPE_CHARACTERS_AND_SUBSTITUTION QTQA_SOURCE_PROPERTY testscript diff --git a/t/testdata/13_manual_overrides/expected/projects/testproject/stages/teststage b/t/testdata/13_manual_overrides/expected/projects/testproject/stages/teststage index 0a7b3c41..999ada69 100644 --- a/t/testdata/13_manual_overrides/expected/projects/testproject/stages/teststage +++ b/t/testdata/13_manual_overrides/expected/projects/testproject/stages/teststage @@ -1,6 +1,6 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_TEST_OVERRIDE_PROPERTY=1 -PULSE_TESTPROPERTY=1 +QTQA_TEST_OVERRIDE_PROPERTY=1 +QTQA_TESTPROPERTY=1 test_override_environment=1 -export PULSE_BASE_DIR PULSE_TEST_OVERRIDE_PROPERTY PULSE_TESTPROPERTY test_override_environment +export PULSE_BASE_DIR QTQA_TEST_OVERRIDE_PROPERTY QTQA_TESTPROPERTY test_override_environment testscript diff --git a/t/testdata/14_no_manual_overrides/expected/projects/testproject/stages/teststage b/t/testdata/14_no_manual_overrides/expected/projects/testproject/stages/teststage index d7304d30..71bb750c 100644 --- a/t/testdata/14_no_manual_overrides/expected/projects/testproject/stages/teststage +++ b/t/testdata/14_no_manual_overrides/expected/projects/testproject/stages/teststage @@ -1,6 +1,6 @@ PULSE_BASE_DIR=BASE_DIR PULSE_BUILD_NUMBER=123 PULSE_BUILD_REASON='faked by test script' -PULSE_TESTPROPERTY=1 -export PULSE_BASE_DIR PULSE_BUILD_NUMBER PULSE_BUILD_REASON PULSE_TESTPROPERTY +QTQA_TESTPROPERTY=1 +export PULSE_BASE_DIR PULSE_BUILD_NUMBER PULSE_BUILD_REASON QTQA_TESTPROPERTY testscript diff --git a/t/testdata/15_inheritance/expected/projects/Base/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Base/stages/stage1 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Base/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Base/stages/stage1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Base/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Base/stages/stage2 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Base/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Base/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Base/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Base/stages/stage3 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Base/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Base/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/stage1 b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/stage1 index 35cb5a9c..3fb54a09 100644 --- a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/stage1 @@ -1,14 +1,14 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_add b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_add index 21116240..a4c071e8 100644 --- a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_add +++ b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_add @@ -1,15 +1,15 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_override b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_override index c4fe2138..4a4c43fc 100644 --- a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_override +++ b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_override @@ -1,14 +1,14 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: sub_value_05' -PULSE_STAGE_PROPERTY_05=sub_value_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: sub_value_05' +QTQA_STAGE_PROPERTY_05=sub_value_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_sub_add b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_sub_add index 234ab1c2..87760c84 100644 --- a/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_sub_add +++ b/t/testdata/15_inheritance/expected/projects/BetweenStages/stages/sub_sub_add @@ -1,16 +1,16 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_NEW_PROPERTY_02=new_value_02 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_NEW_PROPERTY_02 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_NEW_PROPERTY_02=new_value_02 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_NEW_PROPERTY_02 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage1 index e093ccf1..9074ac84 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage1 @@ -1,20 +1,20 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage2 index e093ccf1..9074ac84 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage2 @@ -1,20 +1,20 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage3 index e093ccf1..9074ac84 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition/stages/stage3 @@ -1,20 +1,20 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage1 index e093ccf1..9074ac84 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage1 @@ -1,20 +1,20 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=new_value_01 -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_NEW_PROPERTY_01=new_value_01 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage2 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage3 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_addition_stage/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage1 index fbdf5932..71400a23 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=sub_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=sub_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage2 index fbdf5932..71400a23 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=sub_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=sub_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage3 index fbdf5932..71400a23 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=sub_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=sub_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage1 index 60144917..2db49060 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=sub_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=sub_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage2 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage3 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_stage/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage1 index 34879345..53b0d112 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: new_value_05' -PULSE_PROPERTY_05=new_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: new_value_05' +QTQA_PROPERTY_05=new_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: new_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage2 index 34879345..53b0d112 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: new_value_05' -PULSE_PROPERTY_05=new_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: new_value_05' +QTQA_PROPERTY_05=new_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: new_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage3 index 34879345..53b0d112 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: new_value_05' -PULSE_PROPERTY_05=new_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: new_value_05' +QTQA_PROPERTY_05=new_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: new_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage1 index ecf78007..d2949f44 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage1 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: new_value_05' -PULSE_STAGE_PROPERTY_05=new_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: new_value_05' +QTQA_STAGE_PROPERTY_05=new_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage2 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage2 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage2 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage2 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage3 b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage3 index 914334fa..1699409c 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage3 +++ b/t/testdata/15_inheritance/expected/projects/Sub_single_override_substitution_stage/stages/stage3 @@ -1,19 +1,19 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_PROPERTY_01=base_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: base_value_05' -PULSE_PROPERTY_05=base_value_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: base_stage_value_05' -PULSE_STAGE_PROPERTY_05=base_stage_value_05 +QTQA_PROPERTY_01=base_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: base_value_05' +QTQA_PROPERTY_05=base_value_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: base_stage_value_05' +QTQA_STAGE_PROPERTY_05=base_stage_value_05 base_env_01=env_01 base_env_02=env_02 base_env_03=env_03 base_env_04='subst: base_value_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/15_inheritance/expected/projects/Sub_sub_mixed/stages/stage1 b/t/testdata/15_inheritance/expected/projects/Sub_sub_mixed/stages/stage1 index 6901639a..9f0c2651 100644 --- a/t/testdata/15_inheritance/expected/projects/Sub_sub_mixed/stages/stage1 +++ b/t/testdata/15_inheritance/expected/projects/Sub_sub_mixed/stages/stage1 @@ -1,21 +1,21 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_NEW_PROPERTY_01=subsubmixed_new_01 -PULSE_PROPERTY_01=sub_value_01 -PULSE_PROPERTY_02=base_value_02 -PULSE_PROPERTY_03=base_value_03 -PULSE_PROPERTY_04='subst: subsubmixed_05' -PULSE_PROPERTY_05=subsubmixed_05 -PULSE_STAGE_PROPERTY_01=base_stage_value_01 -PULSE_STAGE_PROPERTY_02=base_stage_value_02 -PULSE_STAGE_PROPERTY_03=base_stage_value_03 -PULSE_STAGE_PROPERTY_04='subst: sub_value_05' -PULSE_STAGE_PROPERTY_05=sub_value_05 -PULSE_SUBSUBMIXED_STAGE1_01=subsubmixed_stage1_value_01 +QTQA_NEW_PROPERTY_01=subsubmixed_new_01 +QTQA_PROPERTY_01=sub_value_01 +QTQA_PROPERTY_02=base_value_02 +QTQA_PROPERTY_03=base_value_03 +QTQA_PROPERTY_04='subst: subsubmixed_05' +QTQA_PROPERTY_05=subsubmixed_05 +QTQA_STAGE_PROPERTY_01=base_stage_value_01 +QTQA_STAGE_PROPERTY_02=base_stage_value_02 +QTQA_STAGE_PROPERTY_03=base_stage_value_03 +QTQA_STAGE_PROPERTY_04='subst: sub_value_05' +QTQA_STAGE_PROPERTY_05=sub_value_05 +QTQA_SUBSUBMIXED_STAGE1_01=subsubmixed_stage1_value_01 base_env_01=env_01 base_env_02=override_02 base_env_03=env_03 base_env_04='subst: subsubmixed_05' base_env_05=env_05 -export PULSE_BASE_DIR PULSE_NEW_PROPERTY_01 PULSE_PROPERTY_01 PULSE_PROPERTY_02 PULSE_PROPERTY_03 PULSE_PROPERTY_04 PULSE_PROPERTY_05 PULSE_STAGE_PROPERTY_01 PULSE_STAGE_PROPERTY_02 PULSE_STAGE_PROPERTY_03 PULSE_STAGE_PROPERTY_04 PULSE_STAGE_PROPERTY_05 PULSE_SUBSUBMIXED_STAGE1_01 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 +export PULSE_BASE_DIR QTQA_NEW_PROPERTY_01 QTQA_PROPERTY_01 QTQA_PROPERTY_02 QTQA_PROPERTY_03 QTQA_PROPERTY_04 QTQA_PROPERTY_05 QTQA_STAGE_PROPERTY_01 QTQA_STAGE_PROPERTY_02 QTQA_STAGE_PROPERTY_03 QTQA_STAGE_PROPERTY_04 QTQA_STAGE_PROPERTY_05 QTQA_SUBSUBMIXED_STAGE1_01 base_env_01 base_env_02 base_env_03 base_env_04 base_env_05 git clone baserepo _basedir _basedir/script diff --git a/t/testdata/16_forcesuccess/expected/projects/testproject/stages/teststage b/t/testdata/16_forcesuccess/expected/projects/testproject/stages/teststage index 451a0f8b..7f398e09 100644 --- a/t/testdata/16_forcesuccess/expected/projects/testproject/stages/teststage +++ b/t/testdata/16_forcesuccess/expected/projects/testproject/stages/teststage @@ -1,4 +1,4 @@ PULSE_BASE_DIR=BASE_DIR -PULSE_OK_PROPERTY=ok -export PULSE_BASE_DIR PULSE_OK_PROPERTY +QTQA_OK_PROPERTY=ok +export PULSE_BASE_DIR QTQA_OK_PROPERTY testscript |