Merge pull request #936 from llucax/disabled-tests

Add a new DISABLED option for tests
dlang · May 12, 2012 · c4c0bf3 · c4c0bf3
2 parents eb00878 + a360038
commit c4c0bf3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/test/Makefile b/test/Makefile
@@ -35,6 +35,10 @@
 #
 #   REQUIRED_ARGS:       arguments to add to the $(DMD) command line
 #                        default: (none)
+#
+#  DISABLED:             text describing why the test is disabled (if empty, the test is
+#                        considered to be enabled).
+#                        default: (none, enabled)
 
 ifeq (,$(OS))
     OS:=$(shell uname)

diff --git a/test/d_do_test.d b/test/d_do_test.d
@@ -51,6 +51,9 @@ struct TestArgs
     string   permuteArgs;
     string   postScript;
     string   requiredArgs;
+    // reason for disabling the test (if empty, the test is not disabled)
+    string   disabled_reason;
+    @property bool disabled() { return disabled_reason != ""; }
 }
 
 struct EnvData
@@ -143,6 +146,8 @@ void gatherTestParameters(ref TestArgs testArgs, string input_dir, string input_
     string compileSeparatelyStr;
     testArgs.compileSeparately = findTestParameter(file, "COMPILE_SEPARATELY", compileSeparatelyStr);
 
+    findTestParameter(file, "DISABLED", testArgs.disabled_reason);
+
     if (findTestParameter(file, "POST_SCRIPT", testArgs.postScript))
         testArgs.postScript = replace(testArgs.postScript, "/", to!string(envData.sep));
 }
@@ -274,12 +279,17 @@ int main(string[] args)
 
     gatherTestParameters(testArgs, input_dir, input_file, envData);
 
-    writefln(" ... %-30s %s%s(%s)",
+    writef(" ... %-30s %s%s(%s)",
             input_file,
             testArgs.requiredArgs,
             (testArgs.requiredArgs ? " " : ""),
             testArgs.permuteArgs);
 
+    if (testArgs.disabled)
+        writefln("!!! [DISABLED: %s]", testArgs.disabled_reason);
+    else
+        write("\n");
+
     if (std.file.exists(output_file))
         std.file.remove(output_file);
 
@@ -355,9 +365,14 @@ int main(string[] args)
                 collectException(std.file.remove(file));
 
             f.writeln();
+
         }
         catch(Exception e)
         {
+            // it failed but it was disabled, exit as if it was successful
+            if (testArgs.disabled)
+                return 0;
+
             f.writeln();
             f.writeln("==============================");
             f.writeln("Test failed: ", e.msg);
@@ -373,6 +388,10 @@ int main(string[] args)
         }
     }
 
+    // it was disabled but it passed! print an informational message
+    if (testArgs.disabled)
+        writefln(" !!! %-30s DISABLED but PASSES!", input_file);
+
     return 0;
 }