Skip to content

Commit e9efefe

Browse files
committed
Merge implementations of run-phobos-tests and run-core-phobos-tests
1 parent 5c0b9bf commit e9efefe

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

run-core-phobos-tests

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
#!/bin/sh
22

3-
. ./find-rdmd.sh
4-
5-
echo Using:
6-
echo " RDMD=$RDMD"
7-
echo " DMD=$DMD"
8-
9-
# GDC doesn't autocreate the dir (and git doesn't beleive in empty dirs)
10-
mkdir -p bin
11-
12-
echo 'Compiling Phobos-socket tests (core tests only)...'
13-
$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
3+
export CORE_PHOBOS_TESTS_ONLY=true
4+
./run-phobos-tests

run-phobos-tests

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,13 @@ echo " DMD=$DMD"
99
# GDC doesn't autocreate the dir (and git doesn't beleive in empty dirs)
1010
mkdir -p bin
1111

12-
echo Compiling Phobos-socket tests...
13-
$RDMD --compiler=$DMD --build-only -g -unittest -debug=MYSQLN_TESTS -ofbin/mysqln-tests-phobos -Isource source/mysql/package.d && echo Running Phobos-socket tests... && bin/mysqln-tests-phobos
12+
if [ "$CORE_PHOBOS_TESTS_ONLY" = "true" ]; then
13+
MSG_SUFFIX=' (core tests only)'
14+
DEBUG_TESTS_ID=MYSQLN_CORE_TESTS
15+
else
16+
MSG_SUFFIX=''
17+
DEBUG_TESTS_ID=MYSQLN_TESTS
18+
fi
19+
20+
echo Compiling Phobos-socket tests${MSG_SUFFIX}...
21+
$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

0 commit comments

Comments
 (0)