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.sh | |
parent | 4213c3f7987b5f2a01fb12049ae7d5b84645640d (diff) |
Make tests run independently from cwdlarge-tests3
Diffstat (limited to 'test/scripts/light-system-test.sh')
-rwxr-xr-x | test/scripts/light-system-test.sh | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh index 58260bd..eee1078 100755 --- a/test/scripts/light-system-test.sh +++ b/test/scripts/light-system-test.sh @@ -3,13 +3,11 @@ 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 -SCRIPTS=${PREFIX}/test/scripts +SCRIPTS=${top_srcdir}/test/scripts tests_start() { ${SCRIPTS}/light-system-test-start.sh @@ -19,24 +17,53 @@ tests_stop() { ${SCRIPTS}/light-system-test-stop.sh } - ${SCRIPTS}/light-system-test-prepare.sh tests_start ${SCRIPTS}/light-system-test-run-1.sh || (echo "Tests failed"; sleep 5; tests_stop; false) sleep 5 tests_stop sleep 5 +echo +echo +echo +echo +echo Test 2 +echo +echo +echo +echo +echo tests_start ${SCRIPTS}/light-system-test-run-2.sh || (echo "Tests failed"; sleep 5; tests_stop; false) sleep 5 tests_stop sleep 5 +echo +echo +echo +echo +echo Test 3 +echo +echo +echo +echo +echo ${SCRIPTS}/light-system-test-prepare-merge-takeover.sh tests_start ${SCRIPTS}/light-system-test-run-3.sh || (echo "Tests failed"; sleep 5; tests_stop; false) sleep 5 tests_stop sleep 5 +echo +echo +echo +echo +echo Test 4 +echo +echo +echo +echo +echo ${SCRIPTS}/light-system-test-prepare-redistribute-frontend.sh tests_start ${SCRIPTS}/light-system-test-run-4.sh || (echo "Tests failed"; sleep 5; tests_stop; false) |