New test.

[mono.git] / mcs / build / library.make

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 30e8804cb4c64820168def4b6c0a15a0e42051e1..83783f553c0ad2118b032fb35350907a73289f06 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -195,18 +195,31 @@ 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,NunitWeb
+TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS
+
+ifdef TEST_HARNESS_VERBOSE
+TEST_HARNESS_OUTPUT = /labels
+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_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'
+TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'
+endif
+
 ## FIXME: i18n problem in the 'sed' command below
 run-test-lib: test-local
        ok=:; \
-       $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) /output:TestResult-$(PROFILE).log /exclude:NotWorking,ValueAdd,CAS,InetAccess /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
-       (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
-       $$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) || ok=false; \
+       $(TEST_HARNESS_POSTPROC) ; $$ok
 
 run-test-ondotnet-lib: test-local
        ok=:; \
-       $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) /exclude=NotDotNet,CAS /output:TestResult-ondotnet-$(PROFILE).log /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
-       (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
-       $$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_POSTPROC_ONDOTNET) ; $$ok
 endif
 
 DISTFILES = $(sourcefile) $(EXTRA_DISTFILES)