From f78f2f1f36b4e8ef1a76434ccaa90053091d2cf6 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Tue, 5 Dec 2017 18:26:33 +0100 Subject: [PATCH] Set DMD path for the DMD testsuite --- src/do_test_dmd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/do_test_dmd.sh b/src/do_test_dmd.sh index 3cf9aa3..4a3d5f4 100755 --- a/src/do_test_dmd.sh +++ b/src/do_test_dmd.sh @@ -46,10 +46,12 @@ fi cd $1/dmd +DMD_PATH=`ls -1 $PWD/generated/*/release/$COMPILER_MODEL/dmd$EXE` + if [ ! -z "$ARGS" ]; then - $makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS RESULTS_DIR=generated ARGS="$ARGS" -f $makefile auto-tester-test >> ../dmd-unittest.log 2>&1 + $makecmd DMD=$DMD_PATH MODEL=$OUTPUT_MODEL $EXTRA_ARGS RESULTS_DIR=generated ARGS="$ARGS" -f $makefile auto-tester-test >> ../dmd-unittest.log 2>&1 else - $makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS RESULTS_DIR=generated -f $makefile auto-tester-test >> ../dmd-unittest.log 2>&1 + $makecmd DMD=$DMD_PATH MODEL=$OUTPUT_MODEL $EXTRA_ARGS RESULTS_DIR=generated -f $makefile auto-tester-test >> ../dmd-unittest.log 2>&1 fi if [ $? -ne 0 ]; then