From 4213c3f7987b5f2a01fb12049ae7d5b84645640d Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 6 Oct 2016 16:54:24 +0200 Subject: Specify where to source test.shvars from ('./'). For people without '.' in PATH. --- test/scripts/light-system-test-prepare-merge-takeover.sh | 2 +- test/scripts/light-system-test-prepare-redistribute-frontend.sh | 2 +- test/scripts/light-system-test-prepare.sh | 2 +- test/scripts/light-system-test-run-1.sh | 2 +- test/scripts/light-system-test-run-2.sh | 2 +- test/scripts/light-system-test-run-3.sh | 2 +- test/scripts/light-system-test-run-4.sh | 2 +- test/scripts/light-system-test-start.sh | 2 +- test/scripts/light-system-test-stop.sh | 2 +- test/scripts/light-system-test.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh index c292c9b..3bb5ad2 100755 --- a/test/scripts/light-system-test-prepare-merge-takeover.sh +++ b/test/scripts/light-system-test-prepare-merge-takeover.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars mv ${INSTDIR}/tests/mergedb ${INSTDIR}/tests/mergedb-down mv ${INSTDIR}/tests/mergedb-secondary ${INSTDIR}/tests/mergedb diff --git a/test/scripts/light-system-test-prepare-redistribute-frontend.sh b/test/scripts/light-system-test-prepare-redistribute-frontend.sh index 2a98674..c9a39a1 100755 --- a/test/scripts/light-system-test-prepare-redistribute-frontend.sh +++ b/test/scripts/light-system-test-prepare-redistribute-frontend.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars mv ${INSTDIR}/tests/machine/machine-1 ${INSTDIR}/tests/machine/machine-1-down mkdir -p ${INSTDIR}/tests/machine/machine-1/db diff --git a/test/scripts/light-system-test-prepare.sh b/test/scripts/light-system-test-prepare.sh index b864b12..e5d1f81 100755 --- a/test/scripts/light-system-test-prepare.sh +++ b/test/scripts/light-system-test-prepare.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars createca () { mkdir ${INSTDIR}/tests/httpsca diff --git a/test/scripts/light-system-test-run-1.sh b/test/scripts/light-system-test-run-1.sh index 246acc0..972925a 100755 --- a/test/scripts/light-system-test-run-1.sh +++ b/test/scripts/light-system-test-run-1.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars (cd ${INSTDIR} && python ../tools/testcase1.py https://localhost:8080/ tests/keys/logkey.pem tests/httpsca/demoCA/cacert.pem) || (echo "Tests failed" ; false) (cd ${INSTDIR}/tests && ../../tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem) || (echo "Check failed" ; false) diff --git a/test/scripts/light-system-test-run-2.sh b/test/scripts/light-system-test-run-2.sh index 204266f..a59f9a8 100755 --- a/test/scripts/light-system-test-run-2.sh +++ b/test/scripts/light-system-test-run-2.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars (cd ${INSTDIR} && python ../tools/verifysct.py --sct-file=tests/submittedcerts --parallel 1 ${BASEURL} --publickey=tests/keys/logkey.pem --cafile tests/httpsca/demoCA/cacert.pem) || (echo "Verification of SCT:s failed" ; false) (cd ${INSTDIR}/tests && ../../tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem) diff --git a/test/scripts/light-system-test-run-3.sh b/test/scripts/light-system-test-run-3.sh index c0969e9..d376a53 100755 --- a/test/scripts/light-system-test-run-3.sh +++ b/test/scripts/light-system-test-run-3.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./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) diff --git a/test/scripts/light-system-test-run-4.sh b/test/scripts/light-system-test-run-4.sh index e2c9c3a..f225703 100755 --- a/test/scripts/light-system-test-run-4.sh +++ b/test/scripts/light-system-test-run-4.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./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 diff --git a/test/scripts/light-system-test-start.sh b/test/scripts/light-system-test-start.sh index 38c50fc..58d7e2d 100755 --- a/test/scripts/light-system-test-start.sh +++ b/test/scripts/light-system-test-start.sh @@ -6,7 +6,7 @@ set -o errexit INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars for node in ${ERLANGNODES}; do (cd ${INSTDIR}/tests ; ../bin/run_erl -daemon nodes/${node}/ nodes/${node}/log/ "exec ../bin/erl -config ${node}") diff --git a/test/scripts/light-system-test-stop.sh b/test/scripts/light-system-test-stop.sh index 8f3447f..77fd00b 100755 --- a/test/scripts/light-system-test-stop.sh +++ b/test/scripts/light-system-test-stop.sh @@ -6,7 +6,7 @@ set -o errexit INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars for node in ${ERLANGNODES}; do ${PREFIX}/tools/to_catlfish.py to_erl ${INSTDIR}/tests/nodes/${node}/ "init:stop()" diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh index 1a60499..58260bd 100755 --- a/test/scripts/light-system-test.sh +++ b/test/scripts/light-system-test.sh @@ -7,7 +7,7 @@ SOFTHSM=/usr/local/bin/softhsm2-util INSTDIR=../catlfish PREFIX=.. -. test.shvars +. ./test.shvars SCRIPTS=${PREFIX}/test/scripts -- cgit v1.1