From c1dfe32e2ba948e62535102ab6dbafa60c3c6eda Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Thu, 13 Oct 2016 15:10:20 +0200 Subject: Make tests run independently from cwd --- test/scripts/light-system-test-start.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/scripts/light-system-test-start.sh') diff --git a/test/scripts/light-system-test-start.sh b/test/scripts/light-system-test-start.sh index 58d7e2d..42cb4be 100755 --- a/test/scripts/light-system-test-start.sh +++ b/test/scripts/light-system-test-start.sh @@ -3,13 +3,12 @@ set -o nounset set -o errexit -INSTDIR=../catlfish -PREFIX=.. +top_srcdir=$(cd $(dirname $0)/../..; pwd) -. ./test.shvars +. ${top_srcdir}/test/test.shvars for node in ${ERLANGNODES}; do - (cd ${INSTDIR}/tests ; ../bin/run_erl -daemon nodes/${node}/ nodes/${node}/log/ "exec ../bin/erl -config ${node}") + (../bin/run_erl -daemon nodes/${node}/ nodes/${node}/log/ "exec ../bin/erl -config ${node}") done for i in 1 2 3 4 5 6 7 8 9 10; do echo "waiting for system to start" @@ -17,7 +16,7 @@ for i in 1 2 3 4 5 6 7 8 9 10; do allstarted=1 notstarted= for testurl in ${TESTURLS}; do - if curl -s --cacert ${INSTDIR}/tests/httpsca/demoCA/cacert.pem -4 https://${testurl} > /dev/null ; then + if curl -s --cacert httpsca/demoCA/cacert.pem -4 https://${testurl} > /dev/null ; then : else allstarted=0 -- cgit v1.1