From b69fc4d32c7d6157cd8ae7a8f33dde1665c9a7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Thu, 9 Aug 2018 05:35:29 +0300
Subject: [PATCH] Fix startup of MaxScales in NPM tests

The output was overwritten for each new test.
---
 test/start_double_maxscale.sh | 5 ++---
 test/start_maxscale.sh        | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/start_double_maxscale.sh b/test/start_double_maxscale.sh
index c2c3e14e3..a82631131 100755
--- a/test/start_double_maxscale.sh
+++ b/test/start_double_maxscale.sh
@@ -13,7 +13,6 @@ test -z "$MAXSCALE_DIR" && exit 1
 rm -r $maxscaledir/secondary/lib/maxscale
 rm -r $maxscaledir/secondary/cache/maxscale
 rm -r $maxscaledir/secondary/run/maxscale
-rm -r $maxscaledir/secondary/log/maxscale
 test -f /tmp/maxadmin2.sock && rm /tmp/maxadmin2.sock
 
 mkdir -m 0755 -p $maxscaledir/secondary/lib/maxscale
@@ -22,7 +21,7 @@ mkdir -m 0755 -p $maxscaledir/secondary/run/maxscale
 mkdir -m 0755 -p $maxscaledir/secondary/log/maxscale
 
 # Start MaxScale
-$maxscaledir/bin/maxscale -lstdout -df $maxscaledir/maxscale.cnf >& $maxscaledir/maxscale1.output &
+$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale1.output &
 
 # Wait for the first MaxScale to start
 for ((i=0;i<60;i++))
@@ -32,7 +31,7 @@ do
 done
 
 # Start a second maxscale
-$maxscaledir/bin/maxscale -lstdout -df $maxscaledir/maxscale_secondary.cnf >& $maxscaledir/maxscale2.output &
+$maxscaledir/bin/maxscale -df $maxscaledir/maxscale_secondary.cnf &>> $maxscaledir/maxscale2.output &
 
 # Wait for the second MaxScale to start
 for ((i=0;i<60;i++))
diff --git a/test/start_maxscale.sh b/test/start_maxscale.sh
index eb07e99c8..53ff3bee1 100755
--- a/test/start_maxscale.sh
+++ b/test/start_maxscale.sh
@@ -10,7 +10,7 @@ maxscaledir=$MAXSCALE_DIR
 test -z "$MAXSCALE_DIR" && exit 1
 
 # Start MaxScale
-$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf >& $maxscaledir/maxscale.output &
+$maxscaledir/bin/maxscale -df $maxscaledir/maxscale.cnf &>> $maxscaledir/maxscale.output &
 pid=$!
 
 # Wait for MaxScale to start