Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / scripts / ci / run-test-acceptance-tests.sh

diff --git a/scripts/ci/run-test-acceptance-tests.sh b/scripts/ci/run-test-acceptance-tests.sh
index 44273d08a462687900a16fc5e53f03f25fc1a432..5b35712b610c206b725fbdd4ca833d15472da736 100755 (executable)
--- a/scripts/ci/run-test-acceptance-tests.sh
+++ b/scripts/ci/run-test-acceptance-tests.sh
@@ -1,23 +1,19 @@
 #!/bin/bash -e
 
-export TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh
-
 make install  # Roslyn tests need a Mono installation
 
-cd acceptance-tests
-
-LANG=en_US.UTF-8 ${TESTCMD} --label=check-ms-test-suite --timeout=30m make check-ms-test-suite
+LANG=en_US.UTF-8 ${TESTCMD} --label=check-ms-test-suite --timeout=30m make -C acceptance-tests check-ms-test-suite
 
-total_tests=$(find . -name TestResult*xml | xargs cat | grep -c "<test-case")
+total_tests=$(find acceptance-tests/ -name TestResult*xml | xargs cat | grep -c "<test-case")
 if [ "$total_tests" -lt "1600" ]
        then echo "*** NOT ENOUGH TEST RESULTS RECORDED, MARKING FAILURE ***"
        exit 1
 fi
 
-${TESTCMD} --label=check-roslyn --timeout=30m make check-roslyn PREFIX=${WORKSPACE}/tmp/mono-acceptance-tests
-rm -rf ${WORKSPACE}/tmp/mono-acceptance-tests  # cleanup the Mono installation used for Roslyn tests
+${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests check-roslyn PREFIX=${MONO_REPO_ROOT}/tmp/mono-acceptance-tests
+rm -rf ${MONO_REPO_ROOT}/tmp/mono-acceptance-tests  # cleanup the Mono installation used for Roslyn tests
 
-${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make coreclr-compile-tests
-${TESTCMD} --label=coreclr-runtest-basic --timeout=10m make coreclr-runtest-basic
-${TESTCMD} --label=coreclr-runtest-coremanglib --timeout=10m make coreclr-runtest-coremanglib
-${TESTCMD} --label=coreclr-gcstress --timeout=1200m make coreclr-gcstress
+${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make -C acceptance-tests coreclr-compile-tests
+${TESTCMD} --label=coreclr-runtest-basic --timeout=10m make -C acceptance-tests coreclr-runtest-basic
+${TESTCMD} --label=coreclr-runtest-coremanglib --timeout=10m make -C acceptance-tests coreclr-runtest-coremanglib
+${TESTCMD} --label=coreclr-gcstress --timeout=1200m make -C acceptance-tests coreclr-gcstress