diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-10-24 13:18:42 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-11-09 09:53:03 +0100 |
commit | 702d227433e2f044796366cf28f5418f4b18debc (patch) | |
tree | 0e3b7c46ccb9c5516a089febec3e10995326c833 /source3/script/tests/test_functions.sh | |
parent | f56e82ff8169fdcb2d132eef453dbf958650bf9d (diff) | |
download | samba-702d227433e2f044796366cf28f5418f4b18debc.tar.gz samba-702d227433e2f044796366cf28f5418f4b18debc.tar.bz2 samba-702d227433e2f044796366cf28f5418f4b18debc.zip |
make test: start winbindd
metze
(This used to be commit 8ad4287cca5393a7fef148365aef2e2377c29280)
Diffstat (limited to 'source3/script/tests/test_functions.sh')
-rw-r--r-- | source3/script/tests/test_functions.sh | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh index 1cc9ea1264..d707c30960 100644 --- a/source3/script/tests/test_functions.sh +++ b/source3/script/tests/test_functions.sh @@ -4,6 +4,9 @@ samba3_stop_sig_term() { kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \ kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$? + kill -USR1 `cat $PIDDIR/timelimit.winbindd.pid` >/dev/null 2>&1 || \ + kill -ALRM `cat $PIDDIR/timelimit.winbindd.pid` || RET=$? + kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \ kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$? @@ -12,6 +15,7 @@ samba3_stop_sig_term() { samba3_stop_sig_kill() { kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 + kill -ALRM `cat $PIDDIR/timelimit.winbindd.pid` >/dev/null 2>&1 kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 return 0; } @@ -69,6 +73,38 @@ samba3_check_or_start() { ) || exit $? &) 2>/dev/null || exit $? echo "DONE" + rm -f $WINBINDD_TEST_LOG + echo -n "STARTING WINBINDD..." + (( + if test x"$WINBINDD_MAXTIME" = x; then + WINBINDD_MAXTIME=2700 + fi + MAKE_TEST_BINARY=$BINDIR/winbindd + export MAKE_TEST_BINARY + timelimit $WINBINDD_MAXTIME $WINBINDD_VALGRIND $BINDIR/winbindd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $WINBINDD_TEST_LOG 2>&1 & + TIMELIMIT_WINBINDD_PID=$! + MAKE_TEST_BINARY= + echo $TIMELIMIT_WINBINDD_PID > $PIDDIR/timelimit.winbindd.pid + wait $TIMELIMIT_WINBINDD_PID + ret=$?; + rm -f $SERVER_TEST_FIFO + if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then + rm -f $SOCKET_WRAPPER_DIR/* + fi + if [ x"$ret" = x"0" ];then + echo "winbindd exits with status $ret"; + echo "winbindd exits with status $ret" >>$WINBINDD_TEST_LOG; + elif [ x"$ret" = x"137" ];then + echo "winbindd got SIGXCPU and exits with status $ret!" + echo "winbindd got SIGXCPU and exits with status $ret!">>$WINBINDD_TEST_LOG; + else + echo "winbindd failed with status $ret!" + echo "winbindd failed with status $ret!">>$WINBINDD_TEST_LOG; + fi + exit $ret; + ) || exit $? &) 2>/dev/null || exit $? + echo "DONE" + rm -f $SMBD_TEST_LOG echo -n "STARTING SMBD..." (( @@ -113,6 +149,15 @@ samba3_nmbd_test_log() { return 1; } +samba3_winbindd_test_log() { + if [ -n "$WINBINDD_TEST_LOG" ];then + if [ -r "$WINBINDD_TEST_LOG" ];then + return 0; + fi + fi + return 1; +} + samba3_smbd_test_log() { if [ -n "$SMBD_TEST_LOG" ];then if [ -r "$SMBD_TEST_LOG" ];then @@ -155,6 +200,9 @@ testit() { if [ -z "$nmbd_log_size" ]; then nmbd_log_size=`wc -l < $NMBD_TEST_LOG`; fi + if [ -z "$winbindd_log_size" ]; then + winbindd_log_size=`wc -l < $WINBINDD_TEST_LOG`; + fi if [ -z "$smbd_log_size" ]; then smbd_log_size=`wc -l < $SMBD_TEST_LOG`; fi @@ -202,6 +250,15 @@ testit() { nmbd_log_size=$new_log_size; } } + samba3_winbindd_test_log && { + new_log_size=`wc -l < $WINBINDD_TEST_LOG`; + test "$new_log_size" = "$winbindd_log_size" || { + echo "WINBINDD OUTPUT:"; + incr_log_size=`expr $new_log_size - $winbindd_log_size`; + tail -$incr_log_size $WINBINDD_TEST_LOG; + winbindd_log_size=$new_log_size; + } + } samba3_smbd_test_log && { new_log_size=`wc -l < $SMBD_TEST_LOG`; test "$new_log_size" = "$smbd_log_size" || { |