From 328a545e5948080f68c280da5f9534f6821230df Mon Sep 17 00:00:00 2001
From: Jonathan Marler <johnnymarler@gmail.com>
Date: Sun, 18 Mar 2018 20:41:00 -0600
Subject: [PATCH] Split compiler agnostic tests so they are only run once
 instead of once per compiler

---
 rdmd_test.d | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/rdmd_test.d b/rdmd_test.d
index 1717ed25c0..82300cc8f1 100755
--- a/rdmd_test.d
+++ b/rdmd_test.d
@@ -95,6 +95,8 @@ void main(string[] args)
     scope (exit) std.file.remove(rdmdApp);
     copy(rdmd, rdmdApp, Yes.preserveAttributes);
 
+    runCompilerAgnosticTests(rdmdApp, defaultCompiler, model);
+
     // if no explicit list of test compilers is set,
     // use the default compiler expected by rdmd
     if (testCompilerList is null)
@@ -107,11 +109,6 @@ void main(string[] args)
         if (concurrencyTest)
             runConcurrencyTest(rdmdApp, testCompiler, model);
     }
-
-    // run the fallback compiler test (this involves
-    // searching for the default compiler, so cannot
-    // be run with other test compilers)
-    runFallbackTest(rdmdApp, defaultCompiler, model);
 }
 
 string compilerSwitch(string compiler) { return "--compiler=" ~ compiler; }
@@ -126,16 +123,8 @@ auto execute(T...)(T args)
     return std.process.execute(args);
 }
 
-auto rdmdArguments(string rdmdApp, string compiler, string model)
-{
-    return [rdmdApp, compilerSwitch(compiler), modelSwitch(model)];
-}
-
-void runTests(string rdmdApp, string compiler, string model)
+void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string model)
 {
-    // path to rdmd + common arguments (compiler, model)
-    auto rdmdArgs = rdmdArguments(rdmdApp, compiler, model);
-
     /* Test help string output when no arguments passed. */
     auto res = execute([rdmdApp]);
     assert(res.status == 1, res.output);
@@ -146,11 +135,27 @@ void runTests(string rdmdApp, string compiler, string model)
     assert(res.status == 0, res.output);
     assert(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));
 
+    // run the fallback compiler test (this involves
+    // searching for the default compiler, so cannot
+    // be run with other test compilers)
+    runFallbackTest(rdmdApp, defaultCompiler, model);
+}
+
+auto rdmdArguments(string rdmdApp, string compiler, string model)
+{
+    return [rdmdApp, compilerSwitch(compiler), modelSwitch(model)];
+}
+
+void runTests(string rdmdApp, string compiler, string model)
+{
+    // path to rdmd + common arguments (compiler, model)
+    auto rdmdArgs = rdmdArguments(rdmdApp, compiler, model);
+
     /* Test --force. */
     string forceSrc = tempDir().buildPath("force_src_.d");
     std.file.write(forceSrc, `void main() { pragma(msg, "compile_force_src"); }`);
 
-    res = execute(rdmdArgs ~ [forceSrc]);
+    auto res = execute(rdmdArgs ~ [forceSrc]);
     assert(res.status == 0, res.output);
     assert(res.output.canFind("compile_force_src"));