File tree Expand file tree Collapse file tree 7 files changed +14
-15
lines changed Expand file tree Collapse file tree 7 files changed +14
-15
lines changed Original file line number Diff line number Diff line change 5
5
* .exe
6
6
.dub
7
7
/dub.selections.json
8
- /mysqln_tests
8
+ /bin
9
9
/testConnectionStr.txt
10
10
11
11
# Executable file name when 'dub' is run on linux
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ before_script:
7
7
- echo 'host=127.0.0.1;port=3306;user=root;pwd=;db=mysqln_testdb' > testConnectionStr.txt
8
8
9
9
install : ./travis-install-deps.sh
10
- script : ./run-tests
10
+ script : ./run-phobos- tests
11
11
12
12
matrix :
13
13
include :
Original file line number Diff line number Diff line change @@ -18,5 +18,5 @@ echo Using:
18
18
echo " RDMD=$RDMD "
19
19
echo " DMD=$DMD "
20
20
21
- echo Compiling tests...
22
- $RDMD --compiler=$DMD --build-only -g -unittest -debug=MYSQL_INTEGRATION_TESTS -ofmysqln_tests -Isource source/mysql/connection.d && echo Running tests... && ./mysqln_tests
21
+ echo Compiling Phobos-socket tests...
22
+ $RDMD --compiler=$DMD --build-only -g -unittest -debug=MYSQL_INTEGRATION_TESTS -ofbin/mysqln-tests-phobos -Isource source/mysql/connection.d && echo Running Phobos-socket tests... && bin/mysqln-tests-phobos
Original file line number Diff line number Diff line change
1
+ @ echo off
2
+ echo Compiling Phobos-socket tests...
3
+ rdmd --build-only -g -unittest -debug=MYSQL_INTEGRATION_TESTS -ofbin/mysqln-tests-phobos -Isource source/mysql/connection.d && echo Running Phobos-socket tests... && bin/mysqln-tests-phobos
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 61
61
*
62
62
* Developers - How to run the test suite:
63
63
*
64
- * This package contains various unittests and integration tests. To run them,
65
- * first compile mysql-native's connection.d with the following flags:
66
- * -g -unittest -debug=MYSQL_INTEGRATION_TESTS -ofmysqln_tests
64
+ * This package contains various unittests and integration tests. To run them
65
+ * using phobos sockets, run 'run-phobos-tests'.
67
66
*
68
- * Then, running 'mysqln_tests' once will automatically create a file
69
- * 'testConnectionStr.txt' in the same directory as 'mysqln_tests' and then
70
- * exit. This file is deliberately not contained in the source repository
67
+ * The first time you run 'run-phobos-tests', it will automatically create a
68
+ * file 'testConnectionStr.txt' in project's base diretory and then exit.
69
+ * This file is deliberately not contained in the source repository
71
70
* because it's specific to your system.
72
71
*
73
72
* Open the 'testConnectionStr.txt' file and verify the connection settings
78
77
* but they will ONLY modify that one db schema. No other schema will be
79
78
* modified in any way.
80
79
*
81
- * After you've configured the connection string, run 'mysqln_tests ' again
80
+ * After you've configured the connection string, run 'run-phobos-tests ' again
82
81
* and their tests will be run.
83
82
*
84
83
* Copyright: Copyright 2011
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ debug(MYSQL_INTEGRATION_TESTS)
40
40
41
41
static string cached;
42
42
if (! cached)
43
- cached = buildPath(thisExePath() .dirName() , " testConnectionStr.txt" );
43
+ cached = buildPath(thisExePath.dirName.dirName , " testConnectionStr.txt" );
44
44
45
45
return cached;
46
46
}
You can’t perform that action at this time.
0 commit comments