From 477ecbd4987663b0c121d77fb72bce4f318ee7bb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 1 Sep 2007 02:33:00 +0000 Subject: r24861: Use absolute paths to make it easier to run the testsuite from the Samba3 source. (This used to be commit 022d5a43cedeb5cca7e4cf3424963e2180ec1f2f) --- source4/selftest/selftest.pl | 3 ++- source4/selftest/test_binding_string.sh | 2 +- source4/selftest/test_cifs.sh | 2 +- source4/selftest/test_ejs.sh | 6 ++--- source4/selftest/test_functions.sh | 3 +++ source4/selftest/test_ldap.sh | 10 ++++---- source4/selftest/test_local.sh | 8 +++---- source4/selftest/test_member.sh | 6 ++--- source4/selftest/test_nbt.sh | 4 ++-- source4/selftest/test_net.sh | 2 +- source4/selftest/test_nss.sh | 4 ++-- source4/selftest/test_pidl.sh | 4 ++-- source4/selftest/test_posix.sh | 2 +- source4/selftest/test_quick.sh | 21 ----------------- source4/selftest/test_rpc.sh | 8 +++---- source4/selftest/test_rpc_quick.sh | 24 ------------------- source4/selftest/test_s3upgrade.sh | 8 +++---- source4/selftest/test_session_key.sh | 10 ++++---- source4/selftest/test_simple.sh | 2 +- source4/selftest/tests_all.sh | 34 +++++++++++++-------------- source4/selftest/tests_quick.sh | 41 +++++++++++++++++++++++++++++++-- 21 files changed, 98 insertions(+), 106 deletions(-) delete mode 100755 source4/selftest/test_quick.sh delete mode 100755 source4/selftest/test_rpc_quick.sh diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 370120ab63..c407fbd329 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -387,7 +387,8 @@ if (defined($ENV{PKG_CONFIG_PATH})) { } 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) { diff --git a/source4/selftest/test_binding_string.sh b/source4/selftest/test_binding_string.sh index a8afc07ac1..79ec482ba6 100755 --- a/source4/selftest/test_binding_string.sh +++ b/source4/selftest/test_binding_string.sh @@ -14,5 +14,5 @@ for I in "ncacn_np:\$SERVER" \ "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:\$SERVER" \ "308FB580-1EB2-11CA-923B-08002B1075A7@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 diff --git a/source4/selftest/test_cifs.sh b/source4/selftest/test_cifs.sh index 76bb4c65e7..187a6e11d4 100755 --- a/source4/selftest/test_cifs.sh +++ b/source4/selftest/test_cifs.sh @@ -13,5 +13,5 @@ base=`bin/smbtorture --list | grep "^BASE-" | xargs` 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 diff --git a/source4/selftest/test_ejs.sh b/source4/selftest/test_ejs.sh index 0282fce154..86ea6cd8c9 100755 --- a/source4/selftest/test_ejs.sh +++ b/source4/selftest/test_ejs.sh @@ -6,8 +6,8 @@ CONFIGURATION="$*" 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 "echo.js" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME% #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 diff --git a/source4/selftest/test_functions.sh b/source4/selftest/test_functions.sh index 6a7f8aba98..1983760c64 100755 --- a/source4/selftest/test_functions.sh +++ b/source4/selftest/test_functions.sh @@ -10,3 +10,6 @@ plantest() { echo $env echo $cmdline } + +samba4srcdir=$incdir/.. +samba4bindir=$samba4srcdir/bin diff --git a/source4/selftest/test_ldap.sh b/source4/selftest/test_ldap.sh index 627eb905fb..3eba604358 100755 --- a/source4/selftest/test_ldap.sh +++ b/source4/selftest/test_ldap.sh @@ -6,28 +6,28 @@ incdir=`dirname $0` 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 diff --git a/source4/selftest/test_local.sh b/source4/selftest/test_local.sh index b3b8387f00..ad8a548529 100755 --- a/source4/selftest/test_local.sh +++ b/source4/selftest/test_local.sh @@ -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 diff --git a/source4/selftest/test_member.sh b/source4/selftest/test_member.sh index 88b382fbeb..dff6df6c4e 100755 --- a/source4/selftest/test_member.sh +++ b/source4/selftest/test_member.sh @@ -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" diff --git a/source4/selftest/test_nbt.sh b/source4/selftest/test_nbt.sh index 7346f75983..22062d5d44 100755 --- a/source4/selftest/test_nbt.sh +++ b/source4/selftest/test_nbt.sh @@ -9,10 +9,10 @@ if test x"$TEST_NBT_ENVNAME" = x"";then 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 diff --git a/source4/selftest/test_net.sh b/source4/selftest/test_net.sh index c99fee4f46..e25f695f47 100755 --- a/source4/selftest/test_net.sh +++ b/source4/selftest/test_net.sh @@ -18,7 +18,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do 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 diff --git a/source4/selftest/test_nss.sh b/source4/selftest/test_nss.sh index f493cbe208..689d1038f1 100755 --- a/source4/selftest/test_nss.sh +++ b/source4/selftest/test_nss.sh @@ -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 diff --git a/source4/selftest/test_pidl.sh b/source4/selftest/test_pidl.sh index 7ee2e89e2e..57e7f58966 100755 --- a/source4/selftest/test_pidl.sh +++ b/source4/selftest/test_pidl.sh @@ -10,8 +10,8 @@ incdir=`dirname $0` 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" diff --git a/source4/selftest/test_posix.sh b/source4/selftest/test_posix.sh index 8a547b906e..3eff482525 100755 --- a/source4/selftest/test_posix.sh +++ b/source4/selftest/test_posix.sh @@ -14,5 +14,5 @@ base=`bin/smbtorture --list | grep "^BASE-" | xargs` 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 diff --git a/source4/selftest/test_quick.sh b/source4/selftest/test_quick.sh deleted file mode 100755 index 438c04e444..0000000000 --- a/source4/selftest/test_quick.sh +++ /dev/null @@ -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 diff --git a/source4/selftest/test_rpc.sh b/source4/selftest/test_rpc.sh index 7400356fe4..c5fe52bff5 100755 --- a/source4/selftest/test_rpc.sh +++ b/source4/selftest/test_rpc.sh @@ -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 @@ incdir=`dirname $0` 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 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do 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 @@ for bindoptions in connect $VALIDATE ; do 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 diff --git a/source4/selftest/test_rpc_quick.sh b/source4/selftest/test_rpc_quick.sh deleted file mode 100755 index 8793e0b6e6..0000000000 --- a/source4/selftest/test_rpc_quick.sh +++ /dev/null @@ -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 diff --git a/source4/selftest/test_s3upgrade.sh b/source4/selftest/test_s3upgrade.sh index 6b10323456..db46d8922a 100755 --- a/source4/selftest/test_s3upgrade.sh +++ b/source4/selftest/test_s3upgrade.sh @@ -7,14 +7,14 @@ then 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 diff --git a/source4/selftest/test_session_key.sh b/source4/selftest/test_session_key.sh index 30d03431ba..26b9c0cf0e 100755 --- a/source4/selftest/test_session_key.sh +++ b/source4/selftest/test_session_key.sh @@ -22,17 +22,17 @@ for bindoptions in bigendian seal; do "-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 "$*" diff --git a/source4/selftest/test_simple.sh b/source4/selftest/test_simple.sh index 00cfb34a9f..44e19d5b2c 100755 --- a/source4/selftest/test_simple.sh +++ b/source4/selftest/test_simple.sh @@ -9,5 +9,5 @@ incdir=`dirname $0` 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 diff --git a/source4/selftest/tests_all.sh b/source4/selftest/tests_all.sh index 7a1167e9ac..868d4cfe3e 100755 --- a/source4/selftest/tests_all.sh +++ b/source4/selftest/tests_all.sh @@ -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" diff --git a/source4/selftest/tests_quick.sh b/source4/selftest/tests_quick.sh index bb3065b0a3..71e1934c9a 100755 --- a/source4/selftest/tests_quick.sh +++ b/source4/selftest/tests_quick.sh @@ -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 -- cgit