travis-ci: Use unit-threaded on configurations that support it.

Author: Abscissa

.travis.yml

@@ -14,9 +14,11 @@ matrix:
     - d: dmd-2.080.0
       env: DUB_SELECT=vibe-0.8.3 # DMDFE 2.079+ doesn't support vibe.d v0.7.32
     - d: dmd-2.079.1
-      env: DUB_SELECT=vibe-0.8.3 # DMDFE 2.079+ doesn't support vibe.d v0.7.32
+      env: USE_UNIT_THREADED=true DUB_SELECT=vibe-0.8.3
     - d: dmd-2.078.3
+      env: USE_UNIT_THREADED=true
     - d: dmd-2.077.1
+      env: USE_UNIT_THREADED=true
     - d: dmd-2.076.1
     - d: dmd-2.075.1
     - d: dmd-2.074.1
@@ -29,8 +31,11 @@ matrix:
     - d: ldc-1.9.0
       env: DUB_SELECT=vibe-0.8.3 # DMDFE 2.079+ doesn't support vibe.d v0.7.32
     - d: ldc-1.8.0
+      env: USE_UNIT_THREADED=true
     - d: ldc-1.7.0
+      env: USE_UNIT_THREADED=true
     - d: ldc-1.6.0
+      env: USE_UNIT_THREADED=true
     - d: ldc-1.5.0
     - d: ldc-1.4.0
     - d: ldc-1.3.0
@@ -46,41 +51,41 @@ matrix:
       env: DUB_SELECT=vibe-0.8.3 # DMDFE 2.079+ doesn't support vibe.d v0.7.32
 
     # Test alternative db versions, but only on one compiler version
-    - d: dmd-2.070.2
+    - d: dmd-2.078.3
       services:
         - mysql
       addons: # Remove "mariadb: ..." from default addons, but keep "libevent-dev"
         apt:
           packages: [ libevent-dev ]
-      env: DB=mysql-default
+      env: DB=mysql-default USE_UNIT_THREADED=true
 
-    - d: dmd-2.070.2
+    - d: dmd-2.078.3
       addons:
         mariadb: '5.5'
         apt:
           packages: [ libevent-dev ]
-      env: DB=mariadb-5.5
+      env: DB=mariadb-5.5 USE_UNIT_THREADED=true
 
     - d: dmd-2.078.3
       addons:
         mariadb: '10.0'
         apt:
           packages: [ libevent-dev ]
-      env: DB=mariadb-10.0
+      env: DB=mariadb-10.0 USE_UNIT_THREADED=true
 
     - d: dmd-2.078.3
       addons:
         mariadb: '10.2'
         apt:
           packages: [ libevent-dev ]
-      env: DB=mariadb-10.2
+      env: DB=mariadb-10.2 USE_UNIT_THREADED=true
 
     - d: dmd-2.078.3
       addons:
         mariadb: '10.3'
         apt:
           packages: [ libevent-dev ]
-      env: DB=mariadb-10.3
+      env: DB=mariadb-10.3 USE_UNIT_THREADED=true
 
     # on Mac just test latest & oldest supported dmd and ldc
     - d: dmd-2.080.0

run-phobos-tests

@@ -17,5 +17,23 @@ else
 	DEBUG_TESTS_ID=MYSQLN_TESTS
 fi
 
+if [ "$USE_UNIT_THREADED" = "true" ]; then
+	MSG_SUFFIX="$MSG_SUFFIX (unit-threaded)"
+	UT_VER=0.7.45
+	UT_SUFFIX='-ut'
+	UT_ARGS=-version=MYSQLN_TESTS_NO_MAIN -version=Have_unit_threaded -Iunit-threaded-${UT_VER}/unit-threaded/source/ --extra-file=unit-threaded-${UT_VER}/unit-threaded/libunit-threaded.a --exclude=unit_threaded
+	D_FILE=bin/ut.d
+
+	# Setup unit-threaded
+	dub fetch unit-threaded --version=${UT_VER} --cache=local
+	cd unit-threaded-${UT_VER}/unit-threaded
+	dub build -c gen_ut_main
+	dub build -c library
+	cd ../..
+	unit-threaded-${UT_VER}/unit-threaded/gen_ut_main -f bin/ut.d
+else
+	D_FILE=source/mysql/package.d
+fi
+
 echo Compiling Phobos-socket tests${MSG_SUFFIX}...
-$RDMD --compiler=$DMD --build-only -g -unittest -debug=$DEBUG_TESTS_ID -ofbin/mysqln-tests-phobos -Isource source/mysql/package.d && echo Running Phobos-socket tests${MSG_SUFFIX}... && bin/mysqln-tests-phobos
+$RDMD --compiler=$DMD --build-only -g -unittest $UT_ARGS -debug=$DEBUG_TESTS_ID -ofbin/mysqln-tests-phobos${UT_SUFFIX} -Isource $D_FILE && echo Running Phobos-socket tests${MSG_SUFFIX}... && bin/mysqln-tests-phobos${UT_SUFFIX} "$@"

run-phobos-tests-ut

@@ -1,21 +1,4 @@
 #!/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
-
-# Setup unit-threaded
-dub fetch unit-threaded --version=0.7.45 --cache=local
-cd unit-threaded-0.7.45/unit-threaded
-dub build -c gen_ut_main
-dub build -c library
-cd ../..
-unit-threaded-0.7.45/unit-threaded/gen_ut_main -f bin/ut.d
-
-echo Compiling Phobos-socket tests...
-$RDMD --compiler=$DMD --build-only -g -unittest -debug=MYSQLN_TESTS -version=MYSQLN_TESTS_NO_MAIN -version=Have_unit_threaded -ofbin/mysqln-tests-phobos-ut -Isource -Iunit-threaded-0.7.37/unit-threaded/source/ --extra-file=unit-threaded-0.7.37/unit-threaded/libunit-threaded.a --exclude=unit_threaded bin/ut.d && echo Running Phobos-socket tests... && bin/mysqln-tests-phobos-ut -t "$@"
+export USE_UNIT_THREADED=true
+./run-phobos-tests "$@"

run-vibe-tests

@@ -3,4 +3,8 @@
 # GDC doesn't autocreate the dir (and git doesn't beleive in empty dirs)
 mkdir -p bin
 
-dub test -c unittest-vibe
+if [ "$USE_UNIT_THREADED" = "true" ]; then
+	dub run -c unittest-vibe-ut -- "$@"
+else
+	dub test -c unittest-vibe
+fi

run-vibe-tests-ut

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-# GDC doesn't autocreate the dir (and git doesn't beleive in empty dirs)
-mkdir -p bin
-
-dub run -c unittest-vibe-ut -- -t "$@"
+export USE_UNIT_THREADED=true
+./run-vibe-tests "$@"