svn commit: samba r24886 - in branches/3.2-perltest: . source
source/script/tests
jelmer at samba.org
jelmer at samba.org
Sun Sep 2 03:57:59 GMT 2007
Author: jelmer
Date: 2007-09-02 03:57:56 +0000 (Sun, 02 Sep 2007)
New Revision: 24886
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24886
Log:
Also run Samba3's own tests again.
Modified:
branches/3.2-perltest/
branches/3.2-perltest/source/Makefile.in
branches/3.2-perltest/source/samba3-knownfail
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_local_s3.sh
branches/3.2-perltest/source/script/tests/test_smbtorture_s3.sh
branches/3.2-perltest/source/script/tests/tests_all.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/Makefile.in
===================================================================
--- branches/3.2-perltest/source/Makefile.in 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/Makefile.in 2007-09-02 03:57:56 UTC (rev 24886)
@@ -2088,7 +2088,7 @@
SELFTEST = $(PERL) $(samba4srcdir)/selftest/selftest.pl --prefix=${selftest_prefix}/st \
- --srcdir="${samba4srcdir}" --bindir=${builddir}/bin \
+ --srcdir="${samba4srcdir}" --bindir=${builddir}/bin --testlist="${srcdir}/script/tests/tests_all.sh|" \
--expected-failures=samba3-knownfail --target=samba3 --skip=samba3-skip
##
## Targets for 'make test'
Modified: branches/3.2-perltest/source/samba3-knownfail
===================================================================
--- branches/3.2-perltest/source/samba3-knownfail 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/samba3-knownfail 2007-09-02 03:57:56 UTC (rev 24886)
@@ -9,10 +9,7 @@
RPC-SRVSVC.*/NetShareEnum
RPC-SRVSVC.*/NetCharDevQEnum
RPC-SRVSVC.*/NetCharDevEnum
-RPC-SRVSVC.*/NetSessEnum
-RPC-SRVSVC.*/NetFileEnum
RPC-SRVSVC.*/NetShareGetInfo
-RPC-SRVSVC.*/NetSrvGetInfo
RPC-SAMSYNC
blackbox.kinit/Test login with kerberos ccache
blackbox.kinit/kinit with pkinit
@@ -31,11 +28,14 @@
RAW-IOCTL # FIXME: Should be succeeding
RAW-CONTEXT # FIXME: Should be succeeding
RAW-EAS # FIXME: Should be succeeding
-RAW-SEARCH # FIXME: Should be succeeding
+RAW-SEARCH.*/one file search # FIXME: Should be succeeding
+RAW-SEARCH.*/ea list # FIXME: Should be succeeding
+RAW-SEARCH.*/many files # FIXME: Should be succeeding
RAW-QFILEINFO # FIXME: Should be succeeding
RAW-QFSINFO # FIXME: Should be succeeding
RAW-SFILEINFO # FIXME: Should be succeeding
RAW-STREAMS # FIXME: Should be succeeding
+BASE-RW1 # FIXME: Should be succeeding
RPC-NETLOGSAMBA3 # Should only be run on the build farm
RPC-SAMBA3SESSIONKEY # Should only be run on the build farm
RPC-SAMBA3-GETUSERNAME # Should only be run on the build farm
Modified: branches/3.2-perltest/source/samba3-skip
===================================================================
--- branches/3.2-perltest/source/samba3-skip 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/samba3-skip 2007-09-02 03:57:56 UTC (rev 24886)
@@ -9,9 +9,10 @@
NBT-DGRAM.*
NBT-WINS.*
.*smb2.* # No SMB2 server yet
+SMB2.* # No SMB2 server yet
.*RPC-EVENTLOG.* # No eventlog available for eventlog
.*bigendian.* # Samba 3 doesn't support bigendian stuff
-parse_samba3 # Relies on relative paths to the samba4 source tree
+parse samba3 # Relies on relative paths to the samba4 source tree
RPC-MGMT # No MGMT interface in Samba 3
RPC-SCANNER # No MGMT interface in Samba 3 (required for scanner)
RPC-SAMR # Doesn't work against Samba 3 yet and isn't split up into subtests
@@ -23,6 +24,7 @@
RPC-HANDLES # Doesn't work against Samba 3 yet
RPC-DFS # Doesn't work against Samba 3 yet
RPC-ECHO # Sinkone fails against samba3 for some reason and causes a disconnect
+^LOCAL-.* # No point running the LOCAL Samba 4 tests
.*BASE-BENCH-HOLDCON.* # Very slow
RPC-COUNTCALLS # Slow, fails
RPC-DSSETUP # No DSSETUP interface in Samba 3
@@ -49,3 +51,6 @@
BASE-CASETABLE # Doesn't work against Samba 3 yet
BASE-NTTRANS # Doesn't work against Samba 3 yet
BASE-SCAN-MAXFID # Doesn't work against Samba 3 yet
+RAW-SCAN-EAMAX # Doesn't work against Samba 3 yet
+RAW-BENCH-LOCK # Doesn't work against Samba 3 yet
+BASE-SMB # Doesn't work against Samba 3 yet
Modified: branches/3.2-perltest/source/script/tests/test_functions.sh
===================================================================
--- branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-02 03:57:56 UTC (rev 24886)
@@ -1,3 +1,13 @@
+plantest() {
+ name=$1
+ env=$2
+ shift 2
+ cmdline="$*"
+ echo "-- TEST --"
+ echo $name
+ echo $env
+ echo $cmdline
+}
samba3_stop_sig_term() {
RET=0
Modified: branches/3.2-perltest/source/script/tests/test_local_s3.sh
===================================================================
--- branches/3.2-perltest/source/script/tests/test_local_s3.sh 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/script/tests/test_local_s3.sh 2007-09-02 03:57:56 UTC (rev 24886)
@@ -2,25 +2,11 @@
# this runs the file serving tests that are expected to pass with samba3
-if [ $# != 0 ]; then
-cat <<EOF
-Usage: test_local_s3.sh
-EOF
-exit 1;
-fi
-
incdir=`dirname $0`
. $incdir/test_functions.sh
-failed=0
+BINDIR=$incdir/../../bin
-testit "talloctort" $VALGRIND $BINDIR/talloctort || \
- failed=`expr $failed + 1`
-
-testit "replacetort" $VALGRIND $BINDIR/replacetort || \
- failed=`expr $failed + 1`
-
-testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
- failed=`expr $failed +1`
-
-testok $0 $failed
+plantest "talloctort" none $VALGRIND $BINDIR/talloctort
+plantest "replacetort" none $VALGRIND $BINDIR/replacetort
+plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture
Modified: branches/3.2-perltest/source/script/tests/test_smbtorture_s3.sh
===================================================================
--- branches/3.2-perltest/source/script/tests/test_smbtorture_s3.sh 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/script/tests/test_smbtorture_s3.sh 2007-09-02 03:57:56 UTC (rev 24886)
@@ -2,23 +2,13 @@
# this runs the file serving tests that are expected to pass with samba3
-if [ $# -lt 3 ]; then
-cat <<EOF
-Usage: test_smbtorture_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
-EOF
-exit 1;
-fi
-
-unc="$1"
-username="$2"
-password="$3"
-start="$4"
-shift 4
ADDARGS="$*"
incdir=`dirname $0`
. $incdir/test_functions.sh
+BINDIR=$incdir/../../bin
+
tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
@@ -26,22 +16,6 @@
tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
-skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
-skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-skipped3="MANGLE UTABLE PIPE_NUMBER"
-echo "Skipping the following tests:"
-echo "$skipped1"
-echo "$skipped2"
-echo "$skipped3"
-
-failed=0
for t in $tests; do
- if [ ! -z "$start" -a "$start" != $t ]; then
- continue;
- fi
- start=""
- name="$t"
- testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+ plantest "SAMBA3-$t" dc $VALGRIND $BINDIR/smbtorture $ADDARGS //\$SERVER_IP/tmp -U"\$USERNAME"%"\$PASSWORD" $t
done
-
-testok $0 $failed
Modified: branches/3.2-perltest/source/script/tests/tests_all.sh
===================================================================
--- branches/3.2-perltest/source/script/tests/tests_all.sh 2007-09-02 03:14:32 UTC (rev 24885)
+++ branches/3.2-perltest/source/script/tests/tests_all.sh 2007-09-02 03:57:56 UTC (rev 24886)
@@ -1,6 +1,7 @@
#!/bin/sh
SCRIPTDIR=`dirname $0`
+. $SCRIPTDIR/test_functions.sh
$SCRIPTDIR/test_local_s3.sh
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD ""
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP
+$SCRIPTDIR/test_smbtorture_s3.sh
+plantest "smbclient" dc $SCRIPTDIR/test_smbclient_s3.sh \$SERVER \$SERVER_IP
More information about the samba-cvs
mailing list