(run-test-lib, run-btest-lib): Unify. Give profile-specific name

for output XML file.

svn path=/trunk/mcs/; revision=33875

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 8836e0d44fa4d06958647c6018369e30e0e70bf9..810711f3f28d9cb7929b38609ae1ded50aea3868 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -6,6 +6,8 @@
        (test_sourcefile, btest_sourcefile): Define in terms of
        $(test_lib) or $(btest_lib) only if they're overriden.
        (test_response, test_makefrag): Remove redundant $(PROFILE) in name.
+       (run-test-lib, run-btest-lib): Unify.  Give profile-specific name
+       for output XML file.
        * rules.make (dist-default): Handle any of Makefile, makefile, or
        GNUmakefile being present.
        * profiles/net_2_0.make (TEST_RUNTIME): Don't define.

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 9e0bd5f7bff606f6ff77c44e52d218625e584036..7d7807ba11f276ac8a568e16396a9727a293dc3b 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -140,35 +140,26 @@ $(topdir)/build/deps/nunit.stamp:
        echo "stamp" >$@
 endif
 
+test_assemblies :=
+
 ifdef HAVE_CS_TESTS
+test_assemblies += $(test_lib)
+endif
 
-test-local: $(test_lib)
+ifdef HAVE_VB_TESTS
+test_assemblies += $(btest_lib)
+endif
 
+ifdef test_assemblies
+test-local: $(test_assemblies)
 run-test-local: run-test-lib
+run-test-ondotnet-local: run-test-ondotnet-lib
 
 run-test-lib: test-local
-       $(TEST_RUNTIME) $(TEST_HARNESS) $(test_lib)
-
-run-test-ondotnet-local: run-test-ondotnet-lib
+       $(TEST_RUNTIME) $(TEST_HARNESS) /xml:TestResult-$(PROFILE).xml $(test_assemblies)
 
 run-test-ondotnet-lib: test-local
-       $(TEST_HARNESS) $(test_lib)
-endif
-
-ifdef HAVE_VB_TESTS
-
-test-local: $(btest_lib)
-
-run-test-local: run-btest-lib
-
-run-btest-lib: test-local
-       $(TEST_RUNTIME) $(TEST_HARNESS) $(btest_lib)
-
-run-test-ondotnet-local: run-btest-ondotnet-lib
-
-run-btest-ondotnet-lib: test-local
-       $(TEST_HARNESS) $(btest_lib)
-
+       $(TEST_HARNESS) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies)
 endif
 
 DISTFILES = $(sourcefile) $(test_sourcefile) $(EXTRA_DISTFILES)