Create and use the minsize file.

4 files changed, 6 insertions, 4 deletions

diff --git a/test/scripts/light-system-test-prepare.sh b/test/scripts/light-system-test-prepare.sh
index 6c706fd..1f68ed1 100755
--- a/test/scripts/light-system-test-prepare.sh
+++ b/test/scripts/light-system-test-prepare.sh
@@ -42,7 +42,6 @@ mkdir keys
 (cd keys ; ${top_srcdir}/tools/create-key.sh logkey)
 openssl pkcs8 -topk8 -nocrypt -in keys/logkey-private.pem -out keys/logkey-private.pkcs8
 mkdir mergedb
-touch mergedb/logorder
 mkdir mergedb-secondary
 touch mergedb-secondary/logorder
 printf 0 > mergedb-secondary/verifiedsize
diff --git a/test/scripts/light-system-test-start.sh b/test/scripts/light-system-test-start.sh
index 985a23c..cdfda8c 100755
--- a/test/scripts/light-system-test-start.sh
+++ b/test/scripts/light-system-test-start.sh
@@ -41,6 +41,9 @@ for i in 1 2 3 4 5 6 7 8 9 10; do
     fi
 done
 
-[ $# -gt 0 ] && [ "$1" = "initlog" ] && $top_srcdir/tools/initlog.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg
+if [ $# -gt 0 ] && [ "$1" = "initlog" ]; then
+    shift 1
+    $top_srcdir/tools/initlog.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg $@
+fi
 
 start_node $(echo ${MERGEPRIMARYNODE} | tr ':' ' ')
diff --git a/test/scripts/light-system-test-stop.sh b/test/scripts/light-system-test-stop.sh
index 2265a34..aef9c76 100755
--- a/test/scripts/light-system-test-stop.sh
+++ b/test/scripts/light-system-test-stop.sh
@@ -14,7 +14,7 @@ stop_node() {
 
 for nodegroup in $FRONTENDNODES $MERGEPRIMARYNODE $STORAGENODES $MERGESECONDARYNODES $SIGNINGNODES; do
     for node in $nodegroup; do
-        echo "starting $node"
+        echo "stopping $node"
         stop_node $(echo $node | tr ':' ' ')
     done
 done
diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh
index d2d242c..ad3daca 100755
--- a/test/scripts/light-system-test.sh
+++ b/test/scripts/light-system-test.sh
@@ -49,7 +49,7 @@ echo
 echo
 echo
 ${SCRIPTS}/light-system-test-prepare-merge-takeover.sh
-tests_start initlog
+tests_start initlog --promote-secondary
 ${SCRIPTS}/light-system-test-run-3.sh || (echo "Tests failed"; sleep 5; tests_stop; false)
 sleep 5
 tests_stop