Run tests on Vibe sockets, too.

Author: Abscissa

.gitignore

@@ -4,7 +4,6 @@
 *.dll
 *.exe
 .dub
-/dub.selections.json
 /bin
 /testConnectionStr.txt
 

.travis.yml

@@ -7,7 +7,6 @@ before_script:
     - echo 'host=127.0.0.1;port=3306;user=root;pwd=;db=mysqln_testdb' > testConnectionStr.txt
 
 install: ./travis-install-deps.sh
-script: ./run-phobos-tests
 
 matrix:
     include:

dub.sdl

@@ -4,7 +4,7 @@ license     "BSL-1.0"
 copyright   "Copyright (c) 2011 Steve Teale"
 authors     "Steve Teale" "James W. Oliphant" "simendsjo" "Sönke Ludwig" "sshamov" "Nick Sabalausky"
 
-dependency "vibe-d:core" version="~>0.7.28" optional=true
+dependency "vibe-d:core" version="~>0.7.29" optional=true
 
 sourcePaths "source/"
 importPaths "source/"
@@ -18,3 +18,25 @@ configuration "library" {
 	targetType "library"
 	excludedSourceFiles "source/app.d"
 }
+
+configuration "unittest" {
+	targetType "executable"
+	targetPath "bin/"
+	targetName "mysqln-tests-vibe"
+	excludedSourceFiles "source/app.d"
+
+	preBuildCommands \
+		"run-phobos-tests" \
+		"echo Performing Vibe-socket tests..." \
+		platform="windows"
+
+	preBuildCommands \
+		"./run-phobos-tests" \
+		"echo Performing Vibe-socket tests..." \
+		platform="posix"
+
+	dependency "vibe-d:core" version="~>0.7.29" optional=false
+
+	mainSourceFile "source/mysql/connection.d"
+	debugVersions "MYSQL_INTEGRATION_TESTS"
+}

dub.selections.json

@@ -0,0 +1,11 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"libasync": "0.7.9",
+		"libev": "5.0.0+4.04",
+		"libevent": "2.0.1+2.0.16",
+		"memutils": "0.4.7",
+		"openssl": "1.1.4+1.0.1g",
+		"vibe-d": "0.7.29"
+	}
+}

source/mysql/package.d

@@ -61,10 +61,10 @@
  *
  * Developers - How to run the test suite:
  *
- * This package contains various unittests and integration tests. To run them
- * using phobos sockets, run 'run-phobos-tests'.
+ * This package contains various unittests and integration tests. To run them,
+ * run 'dub test'.
  * 
- * The first time you run 'run-phobos-tests', it will automatically create a
+ * The first time you run 'dub test', it will automatically create a
  * file 'testConnectionStr.txt' in project's base diretory and then exit.
  * This file is deliberately not contained in the source repository
  * because it's specific to your system.
@@ -77,8 +77,9 @@
  * but they will ONLY modify that one db schema. No other schema will be
  * modified in any way.
  * 
- * After you've configured the connection string, run 'run-phobos-tests' again
- * and their tests will be run.
+ * After you've configured the connection string, run 'dub test' again
+ * and their tests will be compiled and run, first using Phobos sockets,
+ * then using Vibe sockets.
  *
  * Copyright: Copyright 2011
  * License:   $(LINK www.boost.org/LICENSE_1_0.txt, Boost License 1.0).