diff options
| author | Magnus Ahltorp <map@kth.se> | 2016-10-13 15:10:20 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2016-10-13 15:16:29 +0200 |
| commit | c1dfe32e2ba948e62535102ab6dbafa60c3c6eda (patch) | |
| tree | f645ce96cb3ec311115f3a4bba410132ca1dc2e9 /test/scripts/light-system-test-run-4.sh | |
| parent | 4213c3f7987b5f2a01fb12049ae7d5b84645640d (diff) | |
Make tests run independently from cwd
Diffstat (limited to 'test/scripts/light-system-test-run-4.sh')
| -rwxr-xr-x | test/scripts/light-system-test-run-4.sh | 10 |
1 files changed, 4 insertions, 6 deletions
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 |