Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / TestDriver.cs

diff --git a/mono/mini/TestDriver.cs b/mono/mini/TestDriver.cs
index 97f5520d3f709c70e91c5823c18432435d3f4ac4..b17cb654fa2903fb1327eb7dd2ff4a299eecd179 100644 (file)
--- a/mono/mini/TestDriver.cs
+++ b/mono/mini/TestDriver.cs
@@ -2,6 +2,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 
+[AttributeUsageAttribute(AttributeTargets.All, Inherited = true, AllowMultiple = true)]
 public class CategoryAttribute : Attribute
 {
        public CategoryAttribute (string category) {
@@ -12,10 +13,22 @@ public class CategoryAttribute : Attribute
                get; set;
        }
 }
+public class TestDriverReporter
+{
+       public int FailedTests { get; private set; }
+       public int SkippedTests { get; private set; }
+       public int ExecutedTests { get; private set; }
+
+       public void ReportResults (int executed, int skipped, int failed) {
+               ExecutedTests = executed;
+               SkippedTests = skipped;
+               FailedTests = failed;
+       }
+};
 
 public class TestDriver {
 
-       static public int RunTests (Type type, string[] args) {
+       static public int RunTests(Type type, string[] args, TestDriverReporter reporter) {
                int failed = 0, ran = 0;
                int result, expected;
                int i, j, iterations;
@@ -23,6 +36,7 @@ public class TestDriver {
                MethodInfo[] methods;
                bool do_timings = false;
                bool verbose = false;
+               bool quiet = false;
                int tms = 0;
                DateTime start, end = DateTime.Now;
 
@@ -30,20 +44,29 @@ public class TestDriver {
 
                var exclude = new Dictionary<string, string> ();
                List<string> run_only = new List<string> ();
+               List<string> exclude_test = new List<string> ();
                if (args != null && args.Length > 0) {
                        for (j = 0; j < args.Length;) {
                                if (args [j] == "--time") {
-                                       do_timings = true;
+                                       do_timings = !quiet;
                                        j ++;
                                } else if (args [j] == "--iter") {
                                        iterations = Int32.Parse (args [j + 1]);
                                        j += 2;
                                } else if ((args [j] == "-v") || (args [j] == "--verbose")) {
-                                       verbose = true;
+                                       verbose = !quiet;
+                                       j += 1;
+                               } else if ((args [j] == "-q") || (args [j] == "--quiet")) {
+                                       quiet = true;
+                                       verbose = false;
+                                       do_timings = false;
                                        j += 1;
                                } else if (args [j] == "--exclude") {
                                        exclude [args [j + 1]] = args [j + 1];
                                        j += 2;
+                               } else if (args [j] == "--exclude-test") {
+                                       exclude_test.Add (args [j + 1]);
+                                       j += 2;
                                } else if (args [j] == "--run-only") {
                                        run_only.Add (args [j + 1]);
                                        j += 2;
@@ -71,9 +94,15 @@ public class TestDriver {
                                        if (!found)
                                                continue;
                                }
-                               if (exclude.Count > 0) {
+                               if (exclude.Count > 0 || exclude_test.Count > 0) {
                                        var attrs = methods [i].GetCustomAttributes (typeof (CategoryAttribute), false);
                                        bool skip = false;
+                                       for (j = 0; j < exclude_test.Count; j++) {
+                                               if (name.EndsWith (exclude_test [j])) {
+                                                       skip = true;
+                                                       break;
+                                               }
+                                       }
                                        foreach (CategoryAttribute attr in attrs) {
                                                if (exclude.ContainsKey (attr.Category))
                                                        skip = true;
@@ -107,20 +136,58 @@ public class TestDriver {
                                }
                        }
                
-                       if (do_timings) {
-                               Console.WriteLine ("Total ms: {0}", tms);
+                       if (!quiet) {
+                               if (do_timings) {
+                                       Console.WriteLine ("Total ms: {0}", tms);
+                               }
+                               if (nskipped > 0)
+                                       Console.WriteLine ("Regression tests: {0} ran, {1} skipped, {2} failed in {3}", ran, nskipped, failed, type);
+                               else
+                                       Console.WriteLine ("Regression tests: {0} ran, {1} failed in {2}", ran, failed, type);
                        }
-                       if (nskipped > 0)
-                               Console.WriteLine ("Regression tests: {0} ran, {1} skipped, {2} failed in {3}", ran, nskipped, failed, type);
-                       else
-                               Console.WriteLine ("Regression tests: {0} ran, {1} failed in {2}", ran, failed, type);
+               }
+
+               if (reporter != null) {
+                       reporter.ReportResults (ran, nskipped, failed);
                }
 
                //Console.WriteLine ("Regression tests: {0} ran, {1} failed in [{2}]{3}", ran, failed, type.Assembly.GetName().Name, type);
                return failed;
        }
+
+       static public int RunTests (Type type, string[] args) {
+               return RunTests (type, args, null);
+       }
+
        static public int RunTests (Type type) {
-               return RunTests (type, null);
+               return RunTests (type, null, null);
        }
 }
 
+/// Provide tests with the ability to find out how much time they have to run before being timed out.
+public class TestTimeout
+{
+       private TimeSpan Timeout { get; }
+
+       private DateTime StartTime { get; }
+
+       public bool HaveTimeLeft { get { return DateTime.UtcNow - StartTime < Timeout; } }
+
+       public static bool IsStressTest { get { return Environment.GetEnvironmentVariable("MONO_TESTS_STRESS") == "1"; } }
+
+       private TestTimeout (TimeSpan timeout)
+       {
+               Timeout = timeout;
+               StartTime = DateTime.UtcNow;
+       }
+
+       public static TestTimeout Start(TimeSpan timeout)
+       {
+               if (timeout.Ticks < 0)
+               {
+                       throw new ArgumentException("timeout");
+               }
+
+               return new TestTimeout(timeout);
+       }
+}