summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test.sh
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-02-07 14:41:59 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-07 14:41:59 +0100
commit71cc72d3c5e977355ebb0aa8bcb065a08207ec2f (patch)
tree1cdb0030b875fae416f45f138c4c85c58afa2ea2 /test/scripts/light-system-test.sh
parent81292083fab81009ac9b1401947feefd094b9384 (diff)
Parallelised merge, sth phase.
Diffstat (limited to 'test/scripts/light-system-test.sh')
-rwxr-xr-xtest/scripts/light-system-test.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh
index 1f761e8..d2d242c 100755
--- a/test/scripts/light-system-test.sh
+++ b/test/scripts/light-system-test.sh
@@ -10,7 +10,7 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd)
SCRIPTS=${top_srcdir}/test/scripts
tests_start() {
- ${SCRIPTS}/light-system-test-start.sh
+ ${SCRIPTS}/light-system-test-start.sh $@
}
tests_stop() {
@@ -18,8 +18,7 @@ tests_stop() {
}
${SCRIPTS}/light-system-test-prepare.sh
-init_log
-tests_start
+tests_start initlog
${SCRIPTS}/light-system-test-run-1.sh || (echo "Tests failed"; sleep 5; tests_stop; false)
sleep 5
tests_stop
@@ -50,7 +49,7 @@ echo
echo
echo
${SCRIPTS}/light-system-test-prepare-merge-takeover.sh
-tests_start
+tests_start initlog
${SCRIPTS}/light-system-test-run-3.sh || (echo "Tests failed"; sleep 5; tests_stop; false)
sleep 5
tests_stop