From: Alexander Köplinger <alex.koeplinger@outlook.com>
Date: Tue, 10 Nov 2015 16:00:01 +0000 (+0100)
Subject: [acceptance-tests] Output Roslyn and ms-test-suite NUNit xml result to current dir
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=681a5582dcaf18c19054f89ca636914eac7a7abf;p=mono.git

[acceptance-tests] Output Roslyn and ms-test-suite NUNit xml result to current dir

Roslyn used xunit-style xml by default, we hack the cibuild.sh script to output nunit-style
for now until we get an option upstream.

This allows us to catch those test results in Jenkins.
---

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index f20846ec344..36967e824fb 100644
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -19,7 +19,7 @@ ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
 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"; \
+		$(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)"; \
 	else \
@@ -45,6 +45,7 @@ check-roslyn:
 	fi; \
 	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
 
 coreclr-validate:
diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json
index baabf314363..3cd5044f49d 100644
--- a/acceptance-tests/SUBMODULES.json
+++ b/acceptance-tests/SUBMODULES.json
@@ -18,7 +18,7 @@
   {
     "name": "ms-test-suite", 
     "url": "git@github.com:xamarin/ms-test-suite.git", 
-    "rev": "4caab98ae449836c2aaacb9748fe0c796b71517f", 
+    "rev": "19f2a7dd44a2bfcf6006fd38033222383e8b81bf", 
     "remote-branch": "origin/master", 
     "branch": "master", 
     "directory": "ms-test-suite"