diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-11-26 00:36:44 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-11-26 00:36:44 +0300 |
| commit | aa46835403f6f34dfb458f8c120789baec9d782c (patch) | |
| tree | 56caa21a757825a1559ab762ed4e91f190f9ffff /mcs/build | |
| parent | b4b7485a4aa792a48fc869de718efa9bdadc8c2e (diff) | |
update nunit options that break upgrade to 2.4.
svn path=/trunk/mcs/; revision=120008
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/build/library.make | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index cd510a8cfa1..300fa7e12d8 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,7 @@ +2008-11-25 Atsushi Enomoto <atsushi@ximian.com> + + * library.make : update nunit options that break upgrade to 2.4. + 2008-11-18 Raja R Harinath <harinath@hurrynot.org> * library.make (TEST_FILES): Notice filenames with ../ in the test diff --git a/mcs/build/library.make b/mcs/build/library.make index c36325f1132..b9f5a67dd3a 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -195,7 +195,7 @@ test-local: $(test_assemblies) run-test-local: run-test-lib run-test-ondotnet-local: run-test-ondotnet-lib -TEST_HARNESS_EXCLUDES = /exclude:NotWorking,ValueAdd,CAS,InetAccess +TEST_HARNESS_EXCLUDES = -exclude=NotWorking,ValueAdd,CAS,InetAccess TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS ifdef TEST_HARNESS_VERBOSE @@ -204,8 +204,8 @@ TEST_HARNESS_OUTPUT_ONDOTNET = /labels TEST_HARNESS_POSTPROC = : TEST_HARNESS_POSTPROC_ONDOTNET = : else -TEST_HARNESS_OUTPUT = /output:TestResult-$(PROFILE).log -TEST_HARNESS_OUTPUT_ONDOTNET = /output:TestResult-ondotnet-$(PROFILE).log +TEST_HARNESS_OUTPUT = -output=TestResult-$(PROFILE).log +TEST_HARNESS_OUTPUT_ONDOTNET = -output=TestResult-ondotnet-$(PROFILE).log TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d' TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d' endif @@ -217,12 +217,12 @@ endif ## FIXME: i18n problem in the 'sed' command below run-test-lib: test-local ok=:; \ - MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) /xml:TestResult-$(PROFILE).xml $(test_assemblies) $(FIXTURE_ARG) || ok=false; \ + MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(FIXTURE_ARG) || ok=false; \ $(TEST_HARNESS_POSTPROC) ; $$ok run-test-ondotnet-lib: test-local ok=:; \ - $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \ + $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) -xml=TestResult-ondotnet-$(PROFILE).xml || ok=false; \ $(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok endif |