From 3bd3c2728812844d1c1dee06ed63aef5f827aac0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 26 Jul 2016 00:43:03 +0200
Subject: [PATCH] [ci] Don't cd in run-test-acceptance-tests.sh

The other scripts like TESTCMD rely on paths being based off of the repo root.
---
 scripts/ci/run-test-acceptance-tests.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/ci/run-test-acceptance-tests.sh b/scripts/ci/run-test-acceptance-tests.sh
index 44273d08a46..0e5fe78169a 100755
--- a/scripts/ci/run-test-acceptance-tests.sh
+++ b/scripts/ci/run-test-acceptance-tests.sh
@@ -4,20 +4,18 @@ 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 -C acceptance-tests check-ms-test-suite
 
-LANG=en_US.UTF-8 ${TESTCMD} --label=check-ms-test-suite --timeout=30m make 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
+${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests 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=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
-- 
2.25.1