sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r21910: Clean up some unused functions.

Browse Source 
(This used to be commit 36cd3406db)
This commit is contained in:
Jelmer Vernooij 2007-03-21 16:26:25 +00:00 committed by Gerald (Jerry) Carter
parent 2fca3f9082
commit 86d77746db
23 changed files with 48 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/script/tests/mktestdc.sh
View File

@ -70,7 +70,7 @@ cat >$CONFFILE<<EOF
[global]
iconv:native = $nativeiconv
netbios name = $NETBIOSNAME
netbios aliases = $SERVER
netbios aliases = $SERVER
workgroup = $DOMAIN
realm = $REALM
private dir = $PRIVATEDIR
@ -80,10 +80,10 @@ cat >$CONFFILE<<EOF
share backend = $SHARE_BACKEND
setup directory = $SRCDIR/setup
js include = $SRCDIR/scripting/libjs
winbindd socket directory = $WINBINDD_SOCKET_DIR
winbindd socket directory = $WINBINDD_SOCKET_DIR
name resolve order = bcast
interfaces = 127.0.0.1/8
tls dh params file = $DHFILE
tls dh params file = $DHFILE
panic action = $SRCDIR/script/gdb_backtrace %PID% %PROG%
wins support = yes
server role = domain controller
@ -91,14 +91,12 @@ cat >$CONFFILE<<EOF
server max protocol = SMB2
notify:inotify = false
ldb:nosync = true
torture:subunitdir = $SRCDIR/bin/torture
torture:basedir = $TEST_DATA_PREFIX
system:anonymous = true
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
log level = $SMBD_LOGLEVEL
gensec:require_pac = true
log level = $SMBD_LOGLEVEL
[tmp]
path = $TMPDIR
@ -297,4 +295,4 @@ echo "PREFIX=$PREFIX"
echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
echo "LDAPDIR=$LDAPDIR"
echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
echo "PROVISION_ACI=$PROVISION_ACI"
echo "PROVISION_ACI=$PROVISION_ACI"

3
source4/script/tests/selftest.pl
View File

@ -313,7 +313,7 @@ Behaviour:
--one abort when the first test fails
--immediate print test output for failed tests during run
--verbose be verbose
--analyse-cmd CMD command to run after each test
--analyse-cmd CMD command to run after each test
";
exit(0);
}
@ -346,6 +346,7 @@ my $tests = shift;
# quick hack to disable rpc validation when using valgrind - its way too slow
unless (defined($ENV{VALGRIND})) {
$ENV{VALIDATE} = "validate";
$ENV{MALLOC_CHECK_} = 2;
}
my $old_pwd = "$RealBin/../..";

5
source4/script/tests/test_binding_string.sh
View File

@ -16,7 +16,6 @@ shift 4
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0;
for I in "ncacn_np:$server" \
"ncacn_ip_tcp:$server" \
"ncacn_np:$server[rpcecho]" \
@ -28,7 +27,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
testit "$I" rpc bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*"
plantest "$I" rpc bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*"
done
testok $0 $failed

6
source4/script/tests/test_blackbox.sh
View File

@ -20,7 +20,5 @@ ADDARGS="$@"
incdir=`dirname $0`
. $incdir/test_functions.sh
testit "smbclient" smb $incdir/../../../testprogs/blackbox/test_smbclient.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$PREFIX" "$ADDARGS"
testit "cifsdd" smb $incdir/../../../testprogs/blackbox/test_cifsdd.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$ADDARGS"
testok $0 $failed
plantest "blackbox.smbclient" smb $incdir/../../../testprogs/blackbox/test_smbclient.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$PREFIX" "$ADDARGS"
plantest "blackbox.cifsdd" smb $incdir/../../../testprogs/blackbox/test_cifsdd.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$ADDARGS"

9
source4/script/tests/test_echo.sh
View File

@ -24,13 +24,12 @@ if [ $server = "localtest" ]; then
transports="ncalrpc $transports"
fi
failed=0
for transport in $transports; do
for bindoptions in connect spnego spnego,sign spnego,seal $VALIDATE padcheck bigendian bigendian,seal; do
for ntlmoptions in \
"--option=socket:testnonblock=True --option=torture:quick=yes"; do
name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
done
done
done
@ -49,12 +48,10 @@ for transport in $transports; do
"--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes" \
; do
name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
done
done
done
name="RPC-ECHO on ncacn_np over smb2"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
testok $0 $failed
plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"

16
source4/script/tests/test_ejs.sh
View File

@ -23,12 +23,10 @@ DATADIR=../testdata
PATH=bin:$PATH
export PATH
testit "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
testit "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
testit "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
testit "ejsnet.js" rpc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
testit "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
testit "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
testit "winreg" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
testok $0 $failed
plantest "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
plantest "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
plantest "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
plantest "ejsnet.js" rpc "$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" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD

38
source4/script/tests/test_functions.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
testit() {
plantest() {
name=$1
env=$2
shift 2
@ -10,39 +10,3 @@ testit() {
echo $env
echo $cmdline
}
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
echo "TEST STATUS: $failed failures";
test x"$failed" = x"0" || {
cat <<EOF
************************
*** TESTSUITE FAILED ***
************************
EOF
}
exit $failed
}
if [ -z "$VALGRIND" ]; then
MALLOC_CHECK_=2
export MALLOC_CHECK_
fi
# initialise the local failed variable to zero when starting each of the tests
failed=0

12
source4/script/tests/test_ldap.sh
View File

@ -17,18 +17,18 @@ incdir=`dirname $0`
p=ldap
for options in "" "--option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD --option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD"; do
testit "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
plantest "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $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
testit "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
plantest "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
done
fi
for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATENESS
do
testit "$t" ldap bin/smbtorture $TORTURE_OPTIONS "-U$USERNAME%$PASSWORD" //$SERVER/_none_ $t
plantest "$t" ldap bin/smbtorture $TORTURE_OPTIONS "-U$USERNAME%$PASSWORD" //$SERVER/_none_ $t
done
# only do the ldb tests when not in quick mode - they are quite slow, and ldb
@ -36,11 +36,9 @@ done
test "$TORTURE_QUICK" = "yes" || {
LDBDIR=lib/ldb
export LDBDIR
testit "ldb" ldap $LDBDIR/tests/test-tdb.sh
plantest "ldb" ldap $LDBDIR/tests/test-tdb.sh
}
SCRIPTDIR=../testprogs/ejs
testit "ejs ldap" ldap $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD
testok $0 $failed
plantest "ejs ldap" ldap $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD

7
source4/script/tests/test_local.sh
View File

@ -22,11 +22,8 @@ incdir=`dirname $0`
SMBD_TEST_FIFO=""
export SMBD_TEST_FIFO
failed=0
for t in $local_tests; do
testit "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
plantest "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
done
testit "tdb stress" none $VALGRIND bin/tdbtorture
testok $0 $failed
plantest "tdb stress" none $VALGRIND bin/tdbtorture

8
source4/script/tests/test_nbt.sh
View File

@ -20,13 +20,11 @@ SCRIPTDIR=../testprogs/ejs
PATH=bin:$PATH
export PATH
testit "nmblookup -U $SERVER $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
testit "nmblookup $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS $SERVER
plantest "nmblookup -U $SERVER $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
plantest "nmblookup $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS $SERVER
NBT_TESTS=`bin/smbtorture --list | grep ^NBT`
for f in $NBT_TESTS; do
testit "$f" netbios bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD
plantest "$f" netbios bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD
done
testok $0 $failed

5
source4/script/tests/test_net.sh
View File

@ -22,7 +22,6 @@ shift 4
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
for bindoptions in seal,padcheck $VALIDATE bigendian; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
case $transport in
@ -32,9 +31,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
done
done
done
testok $0 $failed

6
source4/script/tests/test_pidl.sh
View File

@ -7,14 +7,10 @@ fi
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
if $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
for f in pidl/tests/*.pl; do
testit "$f" none $PERL $f
plantest "$f" none $PERL $f
done
else
echo "Skipping pidl tests - Test::More not installed"
fi
testok $0 $failed

2
source4/script/tests/test_posix.sh
View File

@ -30,5 +30,5 @@ for t in $tests; do
continue;
fi
start=""
testit "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
plantest "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
done

6
source4/script/tests/test_quick.sh
View File

@ -25,15 +25,11 @@ 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"
failed=0
for t in $tests; do
if [ ! -z "$start" -a "$start" != $t ]; then
continue;
fi
start=""
name="$t"
testit "$name" base $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
plantest "$name" base $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
done
testok $0 $failed

8
source4/script/tests/test_rpc.sh
View File

@ -25,7 +25,6 @@ shift 4
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
for bindoptions in seal,padcheck $VALIDATE bigendian; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
case $transport in
@ -35,7 +34,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
done
done
done
@ -49,10 +48,7 @@ for bindoptions in connect $VALIDATE ; do
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
done
done
done
testok $0 $failed

5
source4/script/tests/test_rpc_quick.sh
View File

@ -22,7 +22,6 @@ shift 4
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
for bindoptions in seal,padcheck $VALIDATE bigendian; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
case $transport in
@ -32,9 +31,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
esac
for t in $tests; do
name="$t on $transport with $bindoptions"
testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
done
done
done
testok $0 $failed

4
source4/script/tests/test_s3upgrade.sh
View File

@ -18,5 +18,5 @@ rm -f $PREFIX/*
. script/tests/test_functions.sh
testit "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
#testit "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
plantest "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
#plantest "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf

12
source4/script/tests/test_session_key.sh
View File

@ -17,7 +17,6 @@ shift 5
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
transport="ncacn_np"
for bindoptions in bigendian seal; do
for keyexchange in "yes" "no"; do
@ -37,18 +36,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"
testit "$name" rpc 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=$netbios_name RPC-SECRETS "$*"
plantest "$name" rpc 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=$netbios_name RPC-SECRETS "$*"
done
done
done
done
name="RPC-SECRETS on $transport with $bindoptions with Kerberos"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
name="RPC-SECRETS on $transport with $bindoptions with Kerberos - use target principal"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
done
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login"
testit "$name" rpc 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=$netbios_name" RPC-SECRETS "$*"
plantest "$name" rpc 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=$netbios_name" RPC-SECRETS "$*"
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login, use target principal"
testit "$name" rpc 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=$netbios_name" RPC-SECRETS "$*"
testok $0 $failed
plantest "$name" rpc 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=$netbios_name" RPC-SECRETS "$*"

6
source4/script/tests/test_simple.sh
View File

@ -20,15 +20,11 @@ incdir=`dirname $0`
tests="BASE-RW1"
failed=0
for t in $tests; do
if [ ! -z "$start" -a "$start" != $t ]; then
continue;
fi
start=""
name="$t"
testit "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
plantest "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
done
testok $0 $failed

4
source4/script/tests/test_swig.sh
View File

@ -10,8 +10,6 @@ fi
incdir=`dirname $0`
. $incdir/test_functions.sh
failed=0
export PYTHONPATH=lib/tdb/swig:lib/ldb/swig:scripting/swig:$PYTHONPATH
export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH
@ -20,5 +18,3 @@ scripting/swig/torture/torture_tdb.py
echo Testing ldb wrappers
scripting/swig/torture/torture_ldb.py
testok $0 $failed

4
source4/script/tests/test_w2k3.sh
View File

@ -26,8 +26,6 @@ incdir=`dirname $0`
OPTIONS="-U$username%$password -W $domain --option realm=$realm"
failed=0
name="RPC-SPOOLSS on ncacn_np"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*"
@ -48,5 +46,3 @@ name="RPC-DRSUAPI on ncacn_ip_tcp with seal"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*"
name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian"
testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*"
testok $0 $failed

3
source4/script/tests/test_w2k3_file.sh
View File

@ -39,7 +39,6 @@ fail="RAW-SEARCH RAW-ACLS RAW-QFSINFO"
echo "Skipping tests expected to fail: $fail"
failed=0
for t in $tests; do
if [ ! -z "$start" -a "$start" != $t ]; then
continue;
@ -48,5 +47,3 @@ for t in $tests; do
name="$t"
testit "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
done
testok $0 $failed

2
source4/script/tests/tests_win.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
if [ `whoami` != "root" ]; then
echo "Windows tests will not run without root privilages."
echo "Windows tests will not run without root privileges."
exit 1
fi