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-run-4.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'test/scripts/light-system-test-run-4.sh') diff --git a/test/scripts/light-system-test-run-4.sh b/test/scripts/light-system-test-run-4.sh index f225703..1022fd2 100755 --- a/test/scripts/light-system-test-run-4.sh +++ b/test/scripts/light-system-test-run-4.sh @@ -3,11 +3,9 @@ set -o nounset set -o errexit -SOFTHSM=/usr/local/bin/softhsm2-util -INSTDIR=../catlfish -PREFIX=.. +top_srcdir=$(cd $(dirname $0)/../..; pwd) -. ./test.shvars +. ${top_srcdir}/test/test.shvars -cd ${INSTDIR} && ../tools/merge --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false) -cd ${INSTDIR}/tests && ../../tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem +${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false) +${top_srcdir}/tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem -- cgit v1.1