diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-03-17 00:15:15 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-03-17 00:22:31 +0300 |
| commit | 583567dc94b5c8337eb6b07beb05206874eb7458 (patch) | |
| tree | b63b29fa46567bd12d58a5c14392e1b1d57ad461 /acceptance-tests | |
| parent | 09e4e3806abfbcbda21b2da2f88fb31e737cd215 (diff) | |
[acceptance-test] Ensure the exit code of the main test script is used
Due to our usage of chained commands it'd use the exit code of the last command,
which is not what we want. We use chaining because e.g. in the ms-test-suite
case we still want to run the systemruntimebringup suite even if the conformance
suite had a failing test.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/ms-test-suite.mk | 9 | ||||
| -rw-r--r-- | acceptance-tests/roslyn.mk | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/acceptance-tests/ms-test-suite.mk b/acceptance-tests/ms-test-suite.mk index 05f99482a28..c1c16199481 100644 --- a/acceptance-tests/ms-test-suite.mk +++ b/acceptance-tests/ms-test-suite.mk @@ -1,9 +1,10 @@ check-ms-test-suite: @if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \ - $(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -t:library -warn:1 -r:nunit.framework"; \ - $(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-console.exe -nologo -exclude=MonoBug,BadTest" NUNIT_XML_RESULT=$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml; \ - $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug -warn:1"; \ - $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)"; \ + $(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -t:library -warn:1 -r:nunit.framework" && \ + $(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-console.exe -nologo -exclude=MonoBug,BadTest" NUNIT_XML_RESULT=$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml || EXIT_CODE=1; \ + $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug -warn:1" && \ + $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)" || EXIT_CODE=1; \ + exit $$EXIT_CODE; \ else \ echo "*** [ms-test-suite] Getting the repository failed, you probably don't have access to this Xamarin-internal resource. Skipping."; \ fi
\ No newline at end of file diff --git a/acceptance-tests/roslyn.mk b/acceptance-tests/roslyn.mk index e20b01e4979..17e0e4ce675 100644 --- a/acceptance-tests/roslyn.mk +++ b/acceptance-tests/roslyn.mk @@ -19,5 +19,6 @@ check-roslyn: cd $(ROSLYN_PATH); \ sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \ sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \ - ./cibuild.sh --mono-path $$PREFIX/bin; \ - sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; + ./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \ + sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \ + exit $$EXIT_CODE |