diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-11-11 04:55:05 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-11-13 16:00:55 +0300 |
| commit | 2d0cf43f3a0dc8a38bd7d68d83e0954fe3b92a3a (patch) | |
| tree | bd4774339592a4c1b07e3d49201bb4ed1efb3373 /acceptance-tests | |
| parent | 387316fed644b1deeeeef0b385ae52b68aab3151 (diff) | |
[bcl] Deprecate old NUnit 2.4 framework shipped with Mono
Print a message when running nunit-console about the deprecation.
Additionally, throw a compilation error if compiling against the
TestFixtureAttribute from old NUnit.
Needed changes in ms-test-suite as well since it was still using NUnit.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/SUBMODULES.json | 4 | ||||
| -rw-r--r-- | acceptance-tests/ms-test-suite.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index 01faee39c98..9df7b8a5811 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": "eb7cd709549bffe170653a50805f1593d66ea81e", + "rev": "55b6637eb1de61c743323ec82db1e0cadfee5b32", "remote-branch": "origin/master", "branch": "master", "directory": "ms-test-suite" @@ -31,4 +31,4 @@ "branch": "master", "directory": "benchmarker" } -] +]
\ No newline at end of file diff --git a/acceptance-tests/ms-test-suite.mk b/acceptance-tests/ms-test-suite.mk index bd85bd494bd..318fe2c2328 100644 --- a/acceptance-tests/ms-test-suite.mk +++ b/acceptance-tests/ms-test-suite.mk @@ -1,7 +1,7 @@ check-ms-test-suite: @if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \ - $(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug -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)/conformance build MCS="$(MCS) -debug -t:library -warn:1 -r:nunitlite.dll" && \ + $(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-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; \ |