Author: jelmer Date: 2007-09-27 00:00:38 +0000 (Thu, 27 Sep 2007) New Revision: 25366
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25366 Log: Fix the last few 3.2 tests. Modified: branches/3.2-perltest/ branches/3.2-perltest/source/samba3-skip branches/3.2-perltest/source/script/tests/test_functions.sh branches/3.2-perltest/source/script/tests/test_smbclient_s3.sh Changeset: Property changes on: branches/3.2-perltest ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/3.2-perltest/source/samba3-skip =================================================================== --- branches/3.2-perltest/source/samba3-skip 2007-09-26 23:44:50 UTC (rev 25365) +++ branches/3.2-perltest/source/samba3-skip 2007-09-27 00:00:38 UTC (rev 25366) @@ -69,6 +69,9 @@ BASE-CHARSET BASE-DELAYWRITE RAW-SAMBA3POSIXTIMEDLOC -RAW-COMPOSITE RAW-BENCH-OPLOCK pidl.* +tdb stress +RAW-COMPOSITE.* +BASE-DEFER_OPEN +BASE-SCAN-IOCTL Modified: branches/3.2-perltest/source/script/tests/test_functions.sh =================================================================== --- branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-26 23:44:50 UTC (rev 25365) +++ branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-27 00:00:38 UTC (rev 25366) @@ -9,278 +9,3 @@ echo $cmdline } -samba3_stop_sig_term() { - RET=0 - kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \ - kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$? - - kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \ - kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$? - - return $RET; -} - -samba3_stop_sig_kill() { - kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 - kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 - return 0; -} - -samba3_check_or_start() { - if [ -n "$SERVER_TEST_FIFO" ];then - - trap samba3_stop_sig_kill INT QUIT - trap samba3_stop_sig_kill TERM - - if [ -p "$SERVER_TEST_FIFO" ];then - return 0; - fi - - if [ -n "$SOCKET_WRAPPER_DIR" ];then - if [ -d "$SOCKET_WRAPPER_DIR" ]; then - rm -f $SOCKET_WRAPPER_DIR/* - else - mkdir -p $SOCKET_WRAPPER_DIR - fi - fi - - rm -f $SERVER_TEST_FIFO - mkfifo $SERVER_TEST_FIFO - - rm -f $NMBD_TEST_LOG - echo -n "STARTING NMBD..." - (( - if test x"$NMBD_MAXTIME" = x; then - NMBD_MAXTIME=2700 - fi - MAKE_TEST_BINARY=$BINDIR/nmbd - export MAKE_TEST_BINARY - timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & - TIMELIMIT_NMBD_PID=$! - MAKE_TEST_BINARY= - echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid - wait $TIMELIMIT_NMBD_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 "nmbd exits with status $ret"; - echo "nmbd exits with status $ret" >>$NMBD_TEST_LOG; - elif [ x"$ret" = x"137" ];then - echo "nmbd got SIGXCPU and exits with status $ret!" - echo "nmbd got SIGXCPU and exits with status $ret!">>$NMBD_TEST_LOG; - else - echo "nmbd failed with status $ret!" - echo "nmbd failed with status $ret!">>$NMBD_TEST_LOG; - fi - exit $ret; - ) || exit $? &) 2>/dev/null || exit $? - echo "DONE" - - rm -f $SMBD_TEST_LOG - echo -n "STARTING SMBD..." - (( - if test x"$SMBD_MAXTIME" = x; then - SMBD_MAXTIME=2700 - fi - MAKE_TEST_BINARY=$BINDIR/smbd - export MAKE_TEST_BINARY - timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 & - TIMELIMIT_SMBD_PID=$! - MAKE_TEST_BINARY= - echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid - wait $TIMELIMIT_SMBD_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 "smbd exits with status $ret"; - echo "smbd exits with status $ret" >>$SMBD_TEST_LOG; - elif [ x"$ret" = x"137" ];then - echo "smbd got SIGXCPU and exits with status $ret!" - echo "smbd got SIGXCPU and exits with status $ret!">>$SMBD_TEST_LOG; - else - echo "smbd failed with status $ret!" - echo "smbd failed with status $ret!">>$SMBD_TEST_LOG; - fi - exit $ret; - ) || exit $? &) 2>/dev/null || exit $? - echo "DONE" - fi - return 0; -} - -samba3_nmbd_test_log() { - if [ -n "$NMBD_TEST_LOG" ];then - if [ -r "$NMBD_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 - return 0; - fi - fi - return 1; -} - -samba3_check_only() { - if [ -n "$SERVER_TEST_FIFO" ];then - if [ -p "$SERVER_TEST_FIFO" ];then - return 0; - fi - return 1; - fi - return 0; -} - -testit() { - if [ -z "$PREFIX" ]; then - PREFIX=test_prefix - mkdir -p $PREFIX - fi - name=$1 - shift 1 - binary=$1 - cmdline="$*" - - SERVERS_ARE_UP="no" - - shname=`echo $name | \ - sed -e 's%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g'` - - UNIQUE_PID=`/bin/sh -c 'echo $$'` - TEST_LOG="$PREFIX/test_log.${UNIQUE_PID}" - TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap" - trap "rm -f $TEST_LOG $TEST_PCAP" EXIT - - if [ -z "$nmbd_log_size" ]; then - nmbd_log_size=`wc -l < $NMBD_TEST_LOG`; - fi - if [ -z "$smbd_log_size" ]; then - smbd_log_size=`wc -l < $SMBD_TEST_LOG`; - fi - - if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then - echo "--==--==--==--==--==--==--==--==--==--==--" - echo "Running test $name (level 0 stdout)" - echo "--==--==--==--==--==--==--==--==--==--==--" - date - echo "Testing $name" - else - echo "Testing $name ($failed)" - fi - - samba3_check_only && SERVERS_ARE_UP="yes" - if [ x"$SERVERS_ARE_UP" != x"yes" ];then - if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then - echo "SERVERS are down! Skipping: $cmdline" - echo "==========================================" - echo "TEST SKIPPED: $name (reason SERVERS are down)" - echo "==========================================" - else - echo "TEST SKIPPED: $name (reason SERVERS are down)" - fi - return 1 - fi - - if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then - SOCKET_WRAPPER_PCAP_FILE=$TEST_PCAP - export SOCKET_WRAPPER_PCAP_FILE - fi - - MAKE_TEST_BINARY=$binary - export MAKE_TEST_BINARY - ( $cmdline > $TEST_LOG 2>&1 ) - status=$? - MAKE_TEST_BINARY= - # show any additional output from smbd that has happened in this test - samba3_nmbd_test_log && { - new_log_size=`wc -l < $NMBD_TEST_LOG`; - test "$new_log_size" = "$nmbd_log_size" || { - echo "NMBD OUTPUT:"; - incr_log_size=`expr $new_log_size - $nmbd_log_size`; - tail -$incr_log_size $NMBD_TEST_LOG; - nmbd_log_size=$new_log_size; - } - } - samba3_smbd_test_log && { - new_log_size=`wc -l < $SMBD_TEST_LOG`; - test "$new_log_size" = "$smbd_log_size" || { - echo "SMBD OUTPUT:"; - incr_log_size=`expr $new_log_size - $smbd_log_size`; - tail -$incr_log_size $SMBD_TEST_LOG; - smbd_log_size=$new_log_size; - } - } - - if [ x"$status" != x"0" ]; then - echo "TEST OUTPUT:" - cat $TEST_LOG; - rm -f $TEST_LOG; - if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then - echo "TEST PCAP: $TEST_PCAP" - fi - if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then - echo "==========================================" - echo "TEST FAILED: $name (status $status)" - echo "==========================================" - else - echo "TEST FAILED: $cmdline (status $status)" - fi - trap "" EXIT - return 1; - fi - rm -f $TEST_LOG; - if [ x"$MAKE_TEST_KEEP_PCAP" = x"yes" ];then - echo "TEST PCAP: $TEST_PCAP" - else - rm -f $TEST_PCAP; - fi - if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then - echo "ALL OK: $cmdline" - echo "==========================================" - echo "TEST PASSED: $name" - echo "==========================================" - fi - trap "" EXIT - return 0; -} - -testok() { - name=`basename $1` - failed=$2 - - if [ x"$failed" = x"0" ];then - : - else - echo "$failed TESTS FAILED or SKIPPED ($name)"; - fi - exit $failed -} - -teststatus() { - name=`basename $1` - failed=$2 - - if [ x"$failed" = x"0" ];then - echo "TEST STATUS: $failed"; - else - echo "TEST STATUS: $failed"; - fi - exit $failed -} - -if [ -z "$VALGRIND" ]; then - MALLOC_CHECK_=2 - export MALLOC_CHECK_ -fi - Modified: branches/3.2-perltest/source/script/tests/test_smbclient_s3.sh =================================================================== --- branches/3.2-perltest/source/script/tests/test_smbclient_s3.sh 2007-09-26 23:44:50 UTC (rev 25365) +++ branches/3.2-perltest/source/script/tests/test_smbclient_s3.sh 2007-09-27 00:00:38 UTC (rev 25366) @@ -9,15 +9,29 @@ exit 1; fi +BINDIR=`dirname $0`/../../bin + SERVER="$1" SERVER_IP="$2" SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION" -incdir=`dirname $0` -. $incdir/test_functions.sh - failed=0 +testit() { + name="$1" + shift + cmdline="$*" + echo "test: $name" + $cmdline + status=$? + if [ x$status = x0 ]; then + echo "success: $name" + else + echo "failure: $name" + fi + return $status +} + # Test that a noninteractive smbclient does not prompt test_noninteractive_no_prompt() { @@ -82,4 +96,4 @@ test_interactive_prompt_stdout -l /tmp || \ failed=`expr $failed + 1` -testok $0 $failed +exit $failed
