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 c3bf999d2729ae30c014fee5a8e32a4f4449ce2f..b17cb654fa2903fb1327eb7dd2ff4a299eecd179 100644 (file)
--- a/mono/mini/TestDriver.cs
+++ b/mono/mini/TestDriver.cs
@@ -13,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;
@@ -32,6 +44,7 @@ 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") {
@@ -51,6 +64,9 @@ public class TestDriver {
                                } 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;
@@ -78,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;
@@ -125,73 +147,47 @@ public class TestDriver {
                        }
                }
 
+               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 {
-       const string ENV_TIMEOUT = "TEST_DRIVER_TIMEOUT_SEC";
-       private readonly TimeSpan availableTime;
-       private TimeSpan slack;
-       private DateTime startTime;
-
-       /// <summary>
-       ///   How much time the test runner provided for us or TimeSpan.Zero if there is no bound.
-       /// </summary>
-       public TimeSpan AvailableTime { get { return availableTime; } }
-
-       public DateTime StartTime { get { return startTime; } }
-
-       /// <summary> Extra time to add when deciding if there
-       ///   is still time to run.  Bigger slack means less
-       ///   time left.
-       /// </summary>
-       public TimeSpan Slack {
-               get { return slack; }
-               set { slack = value; }
-       }
+public class TestTimeout
+{
+       private TimeSpan Timeout { get; }
 
-       public TestTimeout () {
-               availableTime = initializeAvailableTime ();
-               slack = defaultSlack ();
-       }
+       private DateTime StartTime { get; }
 
-       /// <summary>
-       ///    Consider the test started.
-       /// </summary>
-       public void Start ()
-       {
-               startTime = DateTime.UtcNow;
-       }
+       public bool HaveTimeLeft { get { return DateTime.UtcNow - StartTime < Timeout; } }
 
-       public bool HaveTimeLeft ()
-       {
-               if (availableTime == TimeSpan.Zero)
-                       return true;
-               var t = DateTime.UtcNow;
-               var finishTime = startTime + availableTime - slack;
-               return (t < finishTime);
-       }
+       public static bool IsStressTest { get { return Environment.GetEnvironmentVariable("MONO_TESTS_STRESS") == "1"; } }
 
-       private TimeSpan defaultSlack ()
+       private TestTimeout (TimeSpan timeout)
        {
-               return TimeSpan.FromSeconds (5);
+               Timeout = timeout;
+               StartTime = DateTime.UtcNow;
        }
 
-       private TimeSpan initializeAvailableTime ()
+       public static TestTimeout Start(TimeSpan timeout)
        {
-               var e = System.Environment.GetEnvironmentVariable(ENV_TIMEOUT);
-               double d;
-               if (Double.TryParse(e, out d)) {
-                       return TimeSpan.FromSeconds(d);
-               } else {
-                       return TimeSpan.Zero;
+               if (timeout.Ticks < 0)
+               {
+                       throw new ArgumentException("timeout");
                }
-       }
 
+               return new TestTimeout(timeout);
+       }
 }