X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2FTestDriver.cs;h=b17cb654fa2903fb1327eb7dd2ff4a299eecd179;hb=HEAD;hp=c779920808f702cc341dc7231d0c80b6385a8b9f;hpb=6733010353a6024a2b437a6cd5c5c30ae6e99218;p=mono.git

diff --git a/mono/mini/TestDriver.cs b/mono/mini/TestDriver.cs
index c779920808f..b17cb654fa2 100644
--- 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;
@@ -31,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") {
@@ -50,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;
@@ -77,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;
@@ -124,11 +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
+{
+	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);
+	}
+}