Skip to content

Commit 531ac6a

Browse files
committed
run-phobos-tests-ut: Use find-rdmd.sh
1 parent e9efefe commit 531ac6a

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

run-phobos-tests-ut

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

3-
# LDC/GDC don't include rdmd, so allow user to specify path to it in $RDMD.
4-
# Otherwise, use "rdmd".
5-
#
6-
# For travis, if "rdmd" doesn't work (ie, LDC/GDC is being tested), then use
7-
# the copy of rdmd that was downloaded by the 'travis-install-deps.sh' script.
8-
if [ -z "$RDMD" ]; then
9-
RDMD=rdmd
10-
if [ "${TRAVIS_OS_NAME}" = 'osx' ]; then
11-
command -v $RDMD >/dev/null 2>&1 || RDMD=local-dmd/dmd2/${TRAVIS_OS_NAME}/bin/rdmd
12-
else
13-
command -v $RDMD >/dev/null 2>&1 || RDMD=local-dmd/dmd2/${TRAVIS_OS_NAME}/bin64/rdmd
14-
fi
15-
fi
16-
17-
if [ -z "$DMD" ]; then
18-
DMD=dmd
19-
fi
3+
. ./find-rdmd.sh
204

215
echo Using:
226
echo " RDMD=$RDMD"
@@ -26,12 +10,12 @@ echo " DMD=$DMD"
2610
mkdir -p bin
2711

2812
# Setup unit-threaded
29-
dub fetch unit-threaded --version=0.7.37 --cache=local
30-
cd unit-threaded-0.7.37/unit-threaded
13+
dub fetch unit-threaded --version=0.7.45 --cache=local
14+
cd unit-threaded-0.7.45/unit-threaded
3115
dub build -c gen_ut_main
3216
dub build -c library
3317
cd ../..
34-
unit-threaded-0.7.37/unit-threaded/gen_ut_main -f bin/ut.d
18+
unit-threaded-0.7.45/unit-threaded/gen_ut_main -f bin/ut.d
3519

3620
echo Compiling Phobos-socket tests...
3721
$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 "$@"

0 commit comments

Comments
 (0)