diff options
| author | Gerald Carter <jerry@samba.org> | 2006-08-30 16:58:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:39:00 -0500 |
| commit | f2b3143cf72c9d8f391b867353757770d1f0b012 (patch) | |
| tree | f5d575590ce00eef1b17b96d6625016dfb3a9f36 /source3/script/tests/test_functions.sh | |
| parent | bc28b5c7008e5df45fbd6bf413d8177e8ba7c367 (diff) | |
| download | samba-f2b3143cf72c9d8f391b867353757770d1f0b012.tar.gz samba-f2b3143cf72c9d8f391b867353757770d1f0b012.tar.bz2 samba-f2b3143cf72c9d8f391b867353757770d1f0b012.zip | |
r17934: allow srcdir != builddir for 'make test'
(This used to be commit 70f223554922947a17e81f1002b184db879a2195)
Diffstat (limited to 'source3/script/tests/test_functions.sh')
| -rw-r--r-- | source3/script/tests/test_functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh index 368832a506..06c77c89d5 100644 --- a/source3/script/tests/test_functions.sh +++ b/source3/script/tests/test_functions.sh @@ -43,7 +43,7 @@ samba3_check_or_start() { if test x"$NMBD_MAXTIME" = x; then NMBD_MAXTIME=2700 fi - timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & + timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/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 @@ -72,7 +72,7 @@ samba3_check_or_start() { if test x"$SMBD_MAXTIME" = x; then SMBD_MAXTIME=2700 fi - timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 & + timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/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 |