* Makefile (run-mcs-tests): Disable TestRunner on net_2_0 profile.

* TestRunner.cs (Main): Exit with non-zero on regressions.

I had BINFMT_MISC that supported executing mono binaries.
No wonder it worked for me.

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

diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 221b639324b57dd8997cd3f9b95da3ac08b2e5d4..9e01e90ed9cc5834df36715223623dab702b5a0e 100644 (file)
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -2,11 +2,13 @@
 
        * Makefile (test-local): Depend on TestRunner-$(PROFILE).cs.
        (run-mcs-tests): Clean up.  Use profile specific test runner.
+       Disable TestRunner on net_2_0 profile.
        * TestRunner.cs (ProcessTester): Redirect stdout too.
        (Tester.Log, Tester.LogLine): New.  Replacements for Console.Write
        and Console.WriteLine that also log to files.
        (Tester.Main): Add new command line argument for log file name.
        Use the name of the compiler to select tests rather than "1".
+       Exit with non-zero on regressions.
 
 2005-03-16 Marek Safar <marek.safar@seznam.cz>
 

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index e0d4a541be9a0cad1835be63c07c951dbb11a344..61c6a1dd753810fb39be04f7ea838e31659287c6 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -54,16 +54,16 @@ COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe
 TEST_PATTERN = 'cs*.cs'
 endif
 
-# ifeq (net_2_0, $(PROFILE))
-# run-mcs-tests:
-#      -rm -f gmcs.log
-#      @./do-tests.pl gmcs '$(CSCOMPILE)' "cs*.cs"
-#      -rm -f generics.log
-#      @./do-tests.pl generics '$(GENERICS_COMPILE)' "gcs*.cs"
-# else
+ifeq (net_2_0, $(PROFILE))
+run-mcs-tests:
+       -rm -f gmcs.log
+       @./do-tests.pl gmcs '$(CSCOMPILE)' "cs*.cs"
+       -rm -f generics.log
+       @./do-tests.pl generics '$(GENERICS_COMPILE)' "gcs*.cs"
+else
 run-mcs-tests: TestRunner-$(PROFILE).exe
        $(with_mono_path) $(RUNTIME) TestRunner-$(PROFILE).exe $(COMPILER_NAME) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
-#endif
+endif
 
 clean-local:
        rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk

diff --git a/mcs/errors/TestRunner.cs b/mcs/errors/TestRunner.cs
index fbef5077197a7eb0a43aa939a3189486456e4262..d6701ec4273bd6cc98c3323eff479575f841b86f 100644 (file)
--- a/mcs/errors/TestRunner.cs
+++ b/mcs/errors/TestRunner.cs
@@ -230,7 +230,7 @@ namespace TestRunner {
 
                        log_file.Close ();
 
-                       return 0;
+                       return regression.Count == 0 ? 0 : 1;
                }
 
                static void ReadWrongErrors (string file)