Speed up full Phobos+Vibe testing by skipping redundant tests between both Phobos and Vibe builds. (Fix #184)

Author: Abscissa

CHANGELOG.md

@@ -1,9 +1,14 @@
 v2.3.0 - TBD
 =====================
 
-- **Internal:** Rework travis config and scripts, including cleanup, testing
-	on more versions of MariaDB server and support for per-job
-	`dub.selections.json` overrides (needed for testing on DMD 2.079+).
+- **Internal:** Rework travis config and scripts, including:
+	- General cleanup.
+	- Testing on more versions of MariaDB server.
+	- [#173](https://github.com/mysql-d/mysql-native/issues/173):
+		Support for per-job `dub.selections.json` overrides (needed for testing on DMD 2.079+).
+	- [#184](https://github.com/mysql-d/mysql-native/issues/184):
+		Speed up full Phobos+Vibe testing by skipping redundant tests between
+		both Phobos and Vibe builds.
 
 v2.2.2 - 2018-05-03
 =====================

run-core-phobos-tests

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. ./find-rdmd.sh
+
+echo Using:
+echo "  RDMD=$RDMD"
+echo "  DMD=$DMD"
+
+# GDC doesn't autocreate the dir (and git doesn't beleive in empty dirs)
+mkdir -p bin
+
+echo 'Compiling Phobos-socket tests (core tests only)...'
+$RDMD --compiler=$DMD --build-only -g -unittest -debug=MYSQLN_CORE_TESTS -ofbin/mysqln-tests-phobos -Isource source/mysql/package.d && echo 'Running Phobos-socket tests (core tests only)...' && bin/mysqln-tests-phobos

run-tests

@@ -1,2 +1,3 @@
 #!/bin/sh
-echo Doing Phobos-socket tests... && ./run-phobos-tests && echo Doing Vibe-socket tests... && ./run-vibe-tests
+echo Doing Phobos and Vibe socket tests...
+echo 'Doing Phobos-socket tests (core tests only)...' && ./run-core-phobos-tests && echo Doing Vibe-socket tests... && ./run-vibe-tests

source/mysql/package.d

@@ -76,7 +76,10 @@ public import mysql.protocol.constants : SvrCapFlags;
 public import mysql.result;
 public import mysql.types;
 
-debug(MYSQLN_TESTS)
+debug(MYSQLN_TESTS)      version = DoCoreTests;
+debug(MYSQLN_CORE_TESTS) version = DoCoreTests;
+
+version(DoCoreTests)
 {
 	public import mysql.protocol.comms;
 	public import mysql.protocol.constants;

source/mysql/test/common.d

@@ -30,7 +30,10 @@ To enable these tests, you have to add the MYSQLN_TESTS
 debug specifier. The reason it uses debug and not version is because dub
 doesn't allow adding version specifiers on the command-line.
 +/
-debug(MYSQLN_TESTS)
+debug(MYSQLN_TESTS)      version = DoCoreTests;
+debug(MYSQLN_CORE_TESTS) version = DoCoreTests;
+
+version(DoCoreTests)
 {
 	public import std.stdio;
 	import std.conv;

source/mysql/test/integration.d

@@ -26,10 +26,16 @@ import mysql.test.common;
 
 alias indexOf = std.string.indexOf; // Needed on DMD 2.064.2
 
+debug(MYSQLN_TESTS)      version = DoCoreTests;
+debug(MYSQLN_CORE_TESTS) version = DoCoreTests;
+
 @("connect")
-debug(MYSQLN_TESTS)
+version(DoCoreTests)
 unittest
 {
+	import std.stdio;
+	writeln("Basic connect test...");
+
 	// Test connect/disconnect
 	mixin(scopedCn);
 }