run_tests: Added --mode=travis which supports new NO_VIBE envar and fixes broken USE_UNIT_THREADED envar.

Author: Abscissa

.travis.yml

@@ -135,7 +135,7 @@ addons:
     packages: [ libevent-dev ]
 
 install: $DMD -ofci_setup ci_setup.d && ./ci_setup
-script: ./run_tests --mode=combined
+script: ./run_tests --mode=travis
 
 matrix:
   include:

CHANGELOG.md

@@ -1,3 +1,18 @@
+v3.0.0 - TBD
+=====================
+
+Update from `vibe-d:core` to `vibe-core`, and various CI improvements.
+
+- **Change:** Switched from outdated `vibe-d:core` to modern `vibe-core`.
+- **Fixed:** [#199](https://github.com/mysql-d/mysql-native/issues/199):
+    It is immposible to use this package anymore without libevent.
+- **Fixed:** [#201](https://github.com/mysql-d/mysql-native/issues/201):
+    Always selects `vibe-d:core`, cannot select `vibe-core`.
+- **Tests:** Add NO_VIBE option for travis-ci (DMDFE 2.075.x and below don't work with vibe-core).
+- **Tests:** [#197](https://github.com/mysql-d/mysql-native/issues/197):
+    Travis-ci build issues on various compiler versions.
+- **Tests:** Fixed: 
+
 v2.3.0 - 2019-02-23
 =====================
 

run_tests.d

@@ -9,7 +9,7 @@ import std.string;
 // Commandline args
 bool useUnitThreaded;
 bool coreTestsOnly;
-enum Mode { phobos, vibe, combined };
+enum Mode { phobos, vibe, combined, travis };
 Mode mode;
 string[] unitThreadedArgs;
 
@@ -18,23 +18,24 @@ int exitCode=0;
 
 // Utils ///////////////////////////////////////////////
 
-string flagUseUnitThreaded(bool on)
+pure string flagUseUnitThreaded(bool on)
 {
 	return on? " --ut" : "";
 }
 
-string flagCoreTestsOnly(bool on)
+pure string flagCoreTestsOnly(bool on)
 {
 	return on? " --core" : "";
 }
 
-string flagMode(Mode mode)
+pure string flagMode(Mode mode)
 {
 	final switch(mode)
 	{
 	case Mode.phobos:   return " --mode=phobos";
 	case Mode.vibe:     return " --mode=vibe";
 	case Mode.combined: return " --mode=combined";
+	case Mode.travis:   return " --mode=travis";
 	}
 }
 
@@ -108,7 +109,7 @@ int main(string[] args)
 			"ut",     "Use unit-threaded (Always includes ut's --trace)", &useUnitThreaded,
 			"core",   "Only run basic core tests (Can only be used with --mode=phobos)", &coreTestsOnly,
 			std.getopt.config.required,
-			"m|mode", "'-m=phobos': Run Phobos tests | '-m=vibe': Run Vibe.d tests | '-m=combined': Run core-only Phobos tests and all Vibe.d tests", &mode,
+			"m|mode", "'-m=phobos': Run Phobos tests | '-m=vibe': Run Vibe.d tests | '-m=combined': Run core-only Phobos tests and all Vibe.d tests | '-m=travis': Travis-CI mode (autodetect settings from envvars)", &mode,
 		);
 
 		if(argsHelp.helpWanted)
@@ -117,7 +118,7 @@ int main(string[] args)
 				"Runs the mysql-native test suite with Phobos sockets, Vibe.d sockets, or combined.\n"~
 				"\n"~
 				"Usage:\n"~
-				"  run_tests --mode=(phobos|vibe|combined) [OPTIONS] [-- [UNIT-THREADED OPTIONS]]\n"~
+				"  run_tests --mode=(phobos|vibe|combined|travis) [OPTIONS] [-- [UNIT-THREADED OPTIONS]]\n"~
 				"\n"~
 				"Examples:\n"~
 				"  run_tests --mode=combined\n"~
@@ -155,6 +156,13 @@ int main(string[] args)
 		return 1;
 	}
 
+	if(mode==Mode.travis && (coreTestsOnly || useUnitThreaded))
+	{
+		stderr.writeln("Cannot use --mode=travis together with any other option.");
+		stderr.writeln("For help: run_tests --help");
+		return 1;
+	}
+
 	unitThreadedArgs = args[1..$];
 	runTests();
 	return exitCode;
@@ -174,6 +182,7 @@ void runTests()
 	case Mode.phobos:   runPhobosTests();   break;
 	case Mode.vibe:     runVibeTests();     break;
 	case Mode.combined: runCombinedTests(); break;
+	case Mode.travis:   runTravisTests();   break;
 	}
 }
 
@@ -270,3 +279,24 @@ void runCombinedTests()
 	);
 	exitCode = vibeStatus;
 }
+
+void runTravisTests()
+{
+    useUnitThreaded = environment["USE_UNIT_THREADED"] == "true";
+    auto noVibe     = environment["NO_VIBE"]           == "true";
+    
+    if(noVibe)
+    {
+        auto phobosStatus = runFromCurrentDir(
+            "run_tests"~
+            flagMode(Mode.phobos)~
+            flagCoreTestsOnly(false)~
+            flagUseUnitThreaded(useUnitThreaded)
+        );
+        exitCode = phobosStatus;
+    }
+    else
+    {
+        runCombinedTests();
+    }
+}