svn commit: samba r24861 - in branches/SAMBA_4_0: . source/selftest
jelmer at samba.org
jelmer at samba.org
Sat Sep 1 02:33:05 GMT 2007
Author: jelmer
Date: 2007-09-01 02:33:00 +0000 (Sat, 01 Sep 2007)
New Revision: 24861
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24861
Log:
Use absolute paths to make it easier to run the testsuite from the Samba3 source.
Removed:
branches/SAMBA_4_0/source/selftest/test_quick.sh
branches/SAMBA_4_0/source/selftest/test_rpc_quick.sh
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/selftest.pl
branches/SAMBA_4_0/source/selftest/test_binding_string.sh
branches/SAMBA_4_0/source/selftest/test_cifs.sh
branches/SAMBA_4_0/source/selftest/test_ejs.sh
branches/SAMBA_4_0/source/selftest/test_functions.sh
branches/SAMBA_4_0/source/selftest/test_ldap.sh
branches/SAMBA_4_0/source/selftest/test_local.sh
branches/SAMBA_4_0/source/selftest/test_member.sh
branches/SAMBA_4_0/source/selftest/test_nbt.sh
branches/SAMBA_4_0/source/selftest/test_net.sh
branches/SAMBA_4_0/source/selftest/test_nss.sh
branches/SAMBA_4_0/source/selftest/test_pidl.sh
branches/SAMBA_4_0/source/selftest/test_posix.sh
branches/SAMBA_4_0/source/selftest/test_rpc.sh
branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh
branches/SAMBA_4_0/source/selftest/test_session_key.sh
branches/SAMBA_4_0/source/selftest/test_simple.sh
branches/SAMBA_4_0/source/selftest/tests_all.sh
branches/SAMBA_4_0/source/selftest/tests_quick.sh
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl 2007-09-01 02:33:00 UTC (rev 24861)
@@ -387,7 +387,8 @@
} else {
$ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig";
}
-$ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
+# Required for smbscript:
+$ENV{PATH} = "$old_pwd/bin:$old_pwd:$ENV{PATH}";
if ($opt_socket_wrapper_pcap) {
Modified: branches/SAMBA_4_0/source/selftest/test_binding_string.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_binding_string.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_binding_string.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -14,5 +14,5 @@
"308FB580-1EB2-11CA-923B-08002B1075A7 at ncacn_np:\$SERVER" \
"308FB580-1EB2-11CA-923B-08002B1075A7 at ncacn_ip_tcp:\$SERVER"
do
- plantest "$I" dc bin/smbtorture $TORTURE_OPTIONS "$I" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" --option=torture:quick=yes RPC-ECHO "$*"
+ plantest "$I" dc $samba4bindir/smbtorture $TORTURE_OPTIONS "$I" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" --option=torture:quick=yes RPC-ECHO "$*"
done
Modified: branches/SAMBA_4_0/source/selftest/test_cifs.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_cifs.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_cifs.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -13,5 +13,5 @@
tests="$base $raw"
for t in $tests; do
- plantest "ntvfs/cifs $t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
+ plantest "ntvfs/cifs $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
done
Modified: branches/SAMBA_4_0/source/selftest/test_ejs.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_ejs.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_ejs.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -6,8 +6,8 @@
incdir=`dirname $0`
. $incdir/test_functions.sh
-SCRIPTDIR=../testprogs/ejs
-DATADIR=../testdata
+SCRIPTDIR=$samba4srcdir/../testprogs/ejs
+DATADIR=$samba4srcdir/../testdata
plantest "base.js" dc "$SCRIPTDIR/base.js" $CONFIGURATION
plantest "samr.js" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
@@ -15,4 +15,4 @@
#plantest "ejsnet.js" dc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser
plantest "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
plantest "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
-plantest "winreg" dc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
+plantest "winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
Modified: branches/SAMBA_4_0/source/selftest/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_functions.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_functions.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -10,3 +10,6 @@
echo $env
echo $cmdline
}
+
+samba4srcdir=$incdir/..
+samba4bindir=$samba4srcdir/bin
Modified: branches/SAMBA_4_0/source/selftest/test_ldap.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_ldap.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_ldap.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -6,28 +6,28 @@
p=ldap
for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
- plantest "TESTING PROTOCOL $p with options $options" dc ../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
+ plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
done
# see if we support ldaps
if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
p=ldaps
for options in "" "-U\$USERNAME%\$PASSWORD"; do
- plantest "TESTING PROTOCOL $p with options $options" dc ../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
+ plantest "TESTING PROTOCOL $p with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh $p \$SERVER_IP $options
done
fi
for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATEVECTOR
do
- plantest "$t" dc bin/smbtorture $TORTURE_OPTIONS "-U\$USERNAME%\$PASSWORD" //\$SERVER_IP/_none_ $t
+ plantest "$t" dc $samba4bindir/smbtorture $TORTURE_OPTIONS "-U\$USERNAME%\$PASSWORD" //\$SERVER_IP/_none_ $t
done
# only do the ldb tests when not in quick mode - they are quite slow, and ldb
# is now pretty well tested by the rest of the quick tests anyway
test "$TORTURE_QUICK" = "yes" || {
- LDBDIR=lib/ldb
+ LDBDIR=$samba4srcdir/lib/ldb
export LDBDIR
plantest "ldb" none $LDBDIR/tests/test-tdb.sh
}
-SCRIPTDIR=../testprogs/ejs
+SCRIPTDIR=$samba4srcdir/../testprogs/ejs
plantest "ejs ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
Modified: branches/SAMBA_4_0/source/selftest/test_local.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_local.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_local.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,12 +1,10 @@
#!/bin/sh
-local_tests=`bin/smbtorture --list | grep "^LOCAL-" | xargs`
-
incdir=`dirname $0`
. $incdir/test_functions.sh
-for t in $local_tests; do
- plantest "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
+for t in `bin/smbtorture --list | grep "^LOCAL-" | xargs`; do
+ plantest "$t" none $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
done
-plantest "tdb stress" none $VALGRIND bin/tdbtorture
+plantest "tdb stress" none $VALGRIND $samba4bindir/tdbtorture
Modified: branches/SAMBA_4_0/source/selftest/test_member.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_member.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_member.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -3,6 +3,6 @@
incdir=`dirname $0`
. $incdir/test_functions.sh
-plantest "RPC-ECHO against member server with local creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"
-plantest "RPC-ECHO against member server with domain creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*"
-plantest "wbinfo -a against member server with domain creds" member $VALGRIND bin/wbinfo -a "\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
+plantest "RPC-ECHO against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"
+plantest "RPC-ECHO against member server with domain creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*"
+plantest "wbinfo -a against member server with domain creds" member $VALGRIND $samba4bindir/wbinfo -a "\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
Modified: branches/SAMBA_4_0/source/selftest/test_nbt.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_nbt.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_nbt.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -9,10 +9,10 @@
TEST_NBT_ENVNAME="dc"
fi
-NBT_TESTS=`bin/smbtorture --list | grep "^NBT-" | xargs`
+NBT_TESTS=`$samba4bindir/smbtorture --list | grep "^NBT-" | xargs`
if test x"$TEST_NBT_ENVNAME" = x"dc";then
for f in $NBT_TESTS; do
- plantest "$f:$TEST_NBT_ENVNAME" $TEST_NBT_ENVNAME bin/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD
+ plantest "$f:$TEST_NBT_ENVNAME" $TEST_NBT_ENVNAME $samba4bindir/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD
done
fi
Modified: branches/SAMBA_4_0/source/selftest/test_net.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_net.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_net.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -18,7 +18,7 @@
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
- plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" $t "$*"
+ plantest "$name" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" $t "$*"
done
done
done
Modified: branches/SAMBA_4_0/source/selftest/test_nss.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_nss.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_nss.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -3,9 +3,9 @@
incdir=`dirname $0`
. $incdir/test_functions.sh
-if [ ! -f bin/nsstest ]; then
+if [ ! -f $samba4bindir/nsstest ]; then
exit 0
fi
-plantest "NSS-TEST using winbind" member $VALGRIND bin/nsstest bin/shared/libnss_winbind.so
+plantest "NSS-TEST using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so
Modified: branches/SAMBA_4_0/source/selftest/test_pidl.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_pidl.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_pidl.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -10,8 +10,8 @@
if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
- for f in $incdir/../pidl/tests/*.pl; do
- plantest "`basename $f`" none $PERL $f "|" ./script/harness2subunit.pl
+ for f in $samba4srcdir/pidl/tests/*.pl; do
+ plantest "`basename $f`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
done
else
echo "Skipping pidl tests - Test::More not installed"
Modified: branches/SAMBA_4_0/source/selftest/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_posix.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_posix.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -14,5 +14,5 @@
tests="$base $raw $smb2"
for t in $tests; do
- plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+ plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
done
Deleted: branches/SAMBA_4_0/source/selftest/test_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_quick.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_quick.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,21 +0,0 @@
-#!/bin/sh
-# run a quick set of filesystem tests
-
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-tests="BASE-UNLINK BASE-ATTR BASE-DELETE"
-tests="$tests BASE-TCON BASE-OPEN"
-tests="$tests BASE-CHKPATH RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO"
-tests="$tests RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE"
-tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME"
-tests="$tests RAW-EAS RAW-STREAMS"
-
-for t in $tests; do
- plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
-done
-
-name=BASE-OPEN
-plantest "ntvfs/cifs $name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $name
Modified: branches/SAMBA_4_0/source/selftest/test_rpc.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_rpc.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_rpc.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,7 +1,5 @@
#!/bin/sh
-
-
# add tests to this list as they start passing, so we test
# that they stay passing
ncacn_np_tests="RPC-SPOOLSS RPC-SRVSVC RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-MGMT RPC-HANDLES RPC-WINREG RPC-WKSSVC RPC-SVCCTL RPC-EPMAPPER RPC-INITSHUTDOWN RPC-EVENTLOG RPC-ATSVC RPC-SAMSYNC RPC-DFS RPC-OXIDRESOLVE RPC-REMACT RPC-SAMBA3SESSIONKEY RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3-WINREG RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-BENCH-RPC RPC-SCANNER RPC-AUTOIDL RPC-AUTHCONTEXT"
@@ -17,7 +15,7 @@
all_tests="$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests $slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS"
# Make sure all tests get run
-for t in `bin/smbtorture --list | grep "^RPC-"`
+for t in `$samba4bindir/smbtorture --list | grep "^RPC-"`
do
if ! echo $all_tests | grep $t > /dev/null
then
@@ -34,7 +32,7 @@
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
- plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ plantest "$name" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
done
done
@@ -48,7 +46,7 @@
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
- plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ plantest "$name" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
done
done
Deleted: branches/SAMBA_4_0/source/selftest/test_rpc_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_rpc_quick.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_rpc_quick.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# add tests to this list as they start passing, so we test
-# that they stay passing
-ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-SCHANNEL RPC-NETLOGON RPC-UNIXINFO RPC-HANDLES"
-ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-HANDLES"
-ncalrpc_tests="RPC-ECHO"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-for bindoptions in seal,padcheck $VALIDATE bigendian; do
- for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
- case $transport in
- ncalrpc) tests=$ncalrpc_tests ;;
- ncacn_np) tests=$ncacn_np_tests ;;
- ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
- esac
- for t in $tests; do
- name="$t on $transport with $bindoptions"
- plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
- done
- done
-done
Modified: branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -7,14 +7,14 @@
exit 1
fi
-SCRIPTDIR=../testprogs/ejs
-DATADIR=../testdata
-
mkdir -p $PREFIX
rm -f $PREFIX/*
incdir=`dirname $0`
. $incdir/test_functions.sh
-plantest "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
+SCRIPTDIR=$samba4srcdir/../testprogs/ejs
+DATADIR=$samba4srcdir/../testdata
+
+plantest "parse samba3" none $samba4bindir/smbscript $DATADIR/samba3/verify $CONFIGURATION $DATADIR/samba3
#plantest "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
Modified: branches/SAMBA_4_0/source/selftest/test_session_key.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_session_key.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_session_key.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -22,17 +22,17 @@
"-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes" \
"-k no --option=usespnego=no"; do
name="RPC-SECRETS on $transport with $bindoptions with NTLM2:$ntlm2 KEYEX:$keyexchange LM_KEY:$lm_key $ntlmoptions"
- plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN --option=gensec:target_hostname=\$NETBIOSNAME RPC-SECRETS "$*"
+ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN --option=gensec:target_hostname=\$NETBIOSNAME RPC-SECRETS "$*"
done
done
done
done
name="RPC-SECRETS on $transport with $bindoptions with Kerberos"
- plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -k yes -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
+ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -k yes -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
name="RPC-SECRETS on $transport with $bindoptions with Kerberos - use target principal"
- plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -k yes -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
+ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -k yes -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
done
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login"
- plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER" -k yes -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
+ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER" -k yes -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login, use target principal"
- plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER" -k yes -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
+ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER" -k yes -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
Modified: branches/SAMBA_4_0/source/selftest/test_simple.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_simple.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/test_simple.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -9,5 +9,5 @@
tests="BASE-RW1"
for t in $tests; do
- plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
+ plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
done
Modified: branches/SAMBA_4_0/source/selftest/tests_all.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/tests_all.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/tests_all.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,18 +1,18 @@
#!/bin/sh
- $SRCDIR/selftest/test_ejs.sh $CONFIGURATION
- $SRCDIR/selftest/test_ldap.sh
- $SRCDIR/selftest/test_nbt.sh "dc"
- $SRCDIR/selftest/test_rpc.sh
- $SRCDIR/selftest/test_net.sh
- $SRCDIR/selftest/test_session_key.sh
- $SRCDIR/selftest/test_binding_string.sh
- $SRCDIR/selftest/test_echo.sh
- $SRCDIR/selftest/test_posix.sh
- $SRCDIR/selftest/test_cifs.sh
- $SRCDIR/selftest/test_local.sh
- $SRCDIR/selftest/test_pidl.sh
- $SRCDIR/selftest/test_blackbox.sh $PREFIX
- $SRCDIR/selftest/test_simple.sh
- $SRCDIR/selftest/test_s3upgrade.sh $PREFIX/upgrade
- $SRCDIR/selftest/test_member.sh
- $SRCDIR/selftest/test_nbt.sh "member"
+$SRCDIR/selftest/test_ejs.sh $CONFIGURATION
+$SRCDIR/selftest/test_ldap.sh
+$SRCDIR/selftest/test_nbt.sh "dc"
+$SRCDIR/selftest/test_rpc.sh
+$SRCDIR/selftest/test_net.sh
+$SRCDIR/selftest/test_session_key.sh
+$SRCDIR/selftest/test_binding_string.sh
+$SRCDIR/selftest/test_echo.sh
+$SRCDIR/selftest/test_posix.sh
+$SRCDIR/selftest/test_cifs.sh
+$SRCDIR/selftest/test_local.sh
+$SRCDIR/selftest/test_pidl.sh
+$SRCDIR/selftest/test_blackbox.sh $PREFIX
+$SRCDIR/selftest/test_simple.sh
+$SRCDIR/selftest/test_s3upgrade.sh $PREFIX/upgrade
+$SRCDIR/selftest/test_member.sh
+$SRCDIR/selftest/test_nbt.sh "member"
Modified: branches/SAMBA_4_0/source/selftest/tests_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/tests_quick.sh 2007-09-01 00:36:01 UTC (rev 24860)
+++ branches/SAMBA_4_0/source/selftest/tests_quick.sh 2007-09-01 02:33:00 UTC (rev 24861)
@@ -1,9 +1,46 @@
#!/bin/sh
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+
TORTURE_QUICK="yes"
export TORTURE_QUICK
$SRCDIR/selftest/test_ejs.sh $CONFIGURATION
$SRCDIR/selftest/test_ldap.sh
$SRCDIR/selftest/test_nbt.sh
-$SRCDIR/selftest/test_quick.sh
-$SRCDIR/selftest/test_rpc_quick.sh
+
+tests="BASE-UNLINK BASE-ATTR BASE-DELETE"
+tests="$tests BASE-TCON BASE-OPEN"
+tests="$tests BASE-CHKPATH RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO"
+tests="$tests RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE"
+tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME"
+tests="$tests RAW-EAS RAW-STREAMS"
+
+for t in $tests; do
+ plantest "$t" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+done
+
+plantest "ntvfs/cifs BASE-OPEN" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" BASE-OPEN
+
+# add tests to this list as they start passing, so we test
+# that they stay passing
+ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-SCHANNEL RPC-NETLOGON RPC-UNIXINFO RPC-HANDLES"
+ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-HANDLES"
+ncalrpc_tests="RPC-ECHO"
+
+for bindoptions in seal,padcheck $VALIDATE bigendian; do
+ for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
+ case $transport in
+ ncalrpc) tests=$ncalrpc_tests ;;
+ ncacn_np) tests=$ncacn_np_tests ;;
+ ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
+ esac
+ for t in $tests; do
+ name="$t on $transport with $bindoptions"
+ plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ done
+ done
+done
More information about the samba-cvs
mailing list