diff options
Diffstat (limited to 'source3/script/tests/test_functions.sh')
| -rw-r--r-- | source3/script/tests/test_functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh index 265385d0b1..4e3b8ce7db 100644 --- a/source3/script/tests/test_functions.sh +++ b/source3/script/tests/test_functions.sh @@ -43,7 +43,7 @@ samba3_check_or_start() { if [ -z "$NMBD_MAXTIME" ]; then NMBD_MAXTIME=2700 fi - timelimit $NMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d1 -s $CONFFILE > $NMBD_TEST_LOG 2>&1 & + timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & TIMELIMIT_NMBD_PID=$! echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid wait $TIMELIMIT_NMBD_PID @@ -65,14 +65,14 @@ samba3_check_or_start() { exit $ret; ) || exit $? &) 2>/dev/null || exit $? echo "DONE" - + rm -f $SMBD_TEST_LOG echo -n "STARTING SMBD..." (( if [ -z "$SMBD_MAXTIME" ]; then SMBD_MAXTIME=2700 fi - timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d1 -s $CONFFILE > $SMBD_TEST_LOG 2>&1 & + timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 & TIMELIMIT_SMBD_PID=$! echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid wait $TIMELIMIT_SMBD_PID |