------------------------------------------------------------
revno: 11304
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-perlselftest
timestamp: Fri 2007-01-26 16:23:24 +0100
message:
Clean up a bit.
Fix s3upgrade tests and start running them again.
removed:
source/script/tests/selftest.sh svn-v2:[EMAIL PROTECTED]
source/script/tests/tests_net.sh svn-v2:[EMAIL PROTECTED]
modified:
source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
source/script/tests/test_ejs.sh svn-v2:[EMAIL PROTECTED]
source/script/tests/test_s3upgrade.sh svn-v2:[EMAIL PROTECTED]
source/script/tests/tests_all.sh svn-v2:[EMAIL PROTECTED]
source/script/tests/tests_xterm.sh* svn-v2:[EMAIL PROTECTED]
testdata/samba3/verify svn-v2:[EMAIL PROTECTED]
=== removed file 'source/script/tests/selftest.sh'
--- a/source/script/tests/selftest.sh 2007-01-15 23:42:52 +0000
+++ b/source/script/tests/selftest.sh 1970-01-01 00:00:00 +0000
@@ -1,268 +0,0 @@
-#!/bin/sh
-# Bootstrap Samba and run a number of tests against it.
-
-if [ $# -lt 1 ]
-then
- echo "$0 PREFIX TESTS"
- exit
-fi
-
-ARG0=$0
-ARG1=$1
-ARG2=$2
-ARG3=$3
-
-if [ -z "$TORTURE_MAXTIME" ]; then
- TORTURE_MAXTIME=1200
-fi
-
-# disable rpc validation when using valgrind - its way too slow
-if [ -z "$VALGRIND" ]; then
- VALIDATE="validate";
-else
- VALIDATE="";
-fi
-
-OLD_PWD=`pwd`
-PREFIX=$ARG1
-PREFIX=`echo $PREFIX | sed s+//+/+`
-export PREFIX
-
-# allow selection of the test lists
-TESTS=$ARG2
-
-if [ $TESTS = "all" ]; then
- TLS_ENABLED="yes"
-else
- TLS_ENABLED="no"
-fi
-export TLS_ENABLED
-
-LD_LDB_MODULE_PATH=$OLD_PWD/bin/modules/ldb
-export LD_LDB_MODULE_PATH
-
-LD_SAMBA_MODULE_PATH=$OLD_PWD/bin/modules
-export LD_SAMBA_MODULE_PATH
-
-LD_LIBRARY_PATH=$OLD_PWD/bin/shared:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-
-PKG_CONFIG_PATH=$OLD_PWD/bin/pkgconfig:$PKG_CONFIG_PATH
-export PKG_CONFIG_PATH
-
-incdir=`dirname $ARG0`
-echo -n "PROVISIONING..."
-. $incdir/mktestsetup.sh $PREFIX >/dev/null || exit 1
-echo "DONE"
-
-PATH=bin:$PATH
-export PATH
-
-DO_SOCKET_WRAPPER=$ARG3
-if [ x"$DO_SOCKET_WRAPPER" = x"SOCKET_WRAPPER" ];then
- SOCKET_WRAPPER_DIR="$PREFIX/w"
- export SOCKET_WRAPPER_DIR
- echo "SOCKET_WRAPPER_DIR=$SOCKET_WRAPPER_DIR"
-else
- echo "NOT USING SOCKET_WRAPPER"
-fi
-
-incdir=`dirname $ARG0`
-. $incdir/test_functions.sh
-
-#Start slapd before smbd
-if [ x"$TEST_LDAP" = x"yes" ]; then
- slapd_start || exit 1;
- echo -n "LDAP PROVISIONING..."
- $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS
--ldap-backend=$LDAPI || {
- echo "LDAP PROVISIONING failed: $srcdir/bin/smbscript
$srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI"
- exit 1;
- }
- #LDAP is slow
- TORTURE_MAXTIME=`expr $TORTURE_MAXTIME '*' 2`
-fi
-
-SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo"
-export SMBD_TEST_FIFO
-SMBD_TEST_LOG="$PREFIX/smbd_test.log"
-export SMBD_TEST_LOG
-
-SOCKET_WRAPPER_DEFAULT_IFACE=1
-export SOCKET_WRAPPER_DEFAULT_IFACE
-smbd_check_or_start
-
-SOCKET_WRAPPER_DEFAULT_IFACE=6
-export SOCKET_WRAPPER_DEFAULT_IFACE
-TORTURE_INTERFACES='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8'
-TORTURE_OPTIONS="--option=interfaces=$TORTURE_INTERFACES $CONFIGURATION"
-# ensure any one smbtorture call doesn't run too long
-TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
-TORTURE_OPTIONS="$TORTURE_OPTIONS --target=samba4"
-export TORTURE_OPTIONS
-
-if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
- TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no"
-fi
-
- runtest() {
- if [ -z "$PREFIX" ]; then
- PREFIX=test_prefix
- mkdir -p $PREFIX
- fi
- name=$1
- shift 1
- cmdline="$*"
-
- SMBD_IS_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 [ -n "$SMBD_TEST_LOG" -a -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
- nf="`expr $failed + $totalfailed`";
- if [ "$nf" = "0" ]; then
- echo "[$current/$total] Testing $name"
- else
- echo "[$current/$total, $nf failures] Testing $name"
- fi
- fi
-
- smbd_check_only && SMBD_IS_UP="yes"
- if [ x"$SMBD_IS_UP" != x"yes" ];then
- if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
- echo "SMBD is down! Skipping: $cmdline"
- echo "=========================================="
- echo "TEST SKIPPED: $name (reason SMBD is down)"
- echo "=========================================="
- else
- echo "TEST SKIPPED: $name (reason SMBD is 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
-
- ( $cmdline > $TEST_LOG 2>&1 )
- status=$?
- # show any additional output from smbd that has happened in this test
- smbd_have_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;
-}
-
-START=`date`
-(
- # give time for nbt server to register its names
- echo delaying for nbt name registration
- sleep 4
- # This will return quickly when things are up, but be slow if we need to wait
for (eg) SSL init
- bin/nmblookup $CONFIGURATION $SERVER
- bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
- bin/nmblookup $CONFIGURATION $SERVER
- bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
- bin/nmblookup $CONFIGURATION $NETBIOSNAME
- bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
-
-# start off with 0 failures
-totalfailed=0
-export totalfailed
-
-. script/tests/tests_$TESTS.sh > $PREFIX/recipe
-total=`grep "TEST --" $PREFIX/recipe | wc -l`
-current=0
-cat $PREFIX/recipe | (
- while read LINE
- do
- if [ "$LINE" = "-- TEST --" ]; then
- read NAME
- read CMDLINE
- current=`expr $current + 1`
- runtest "$NAME" "$CMDLINE" || totalfailed=`expr
$totalfailed + $?`
- else
- echo "$LINE"
- fi
- done
- exit $totalfailed
-)
-exit $?
-) 9>$SMBD_TEST_FIFO
-totalfailed=$?
-
-kill `cat $PIDDIR/smbd.pid`
-
-if [ "$TEST_LDAP"x = "yesx" ]; then
- kill `cat $PIDDIR/slapd.pid`
-fi
-
-END=`date`
-echo "START: $START ($ARG0)";
-echo "END: $END ($ARG0)";
-
-# if there were any valgrind failures, show them
-count=`find $PREFIX -name 'valgrind.log*' | wc -l`
-if [ "$count" != 0 ]; then
- for f in $PREFIX/valgrind.log*; do
- if [ -s $f ] && grep -v DWARF2.CFI.reader $f > /dev/null; then
- echo "VALGRIND FAILURE";
- totalfailed=`expr $totalfailed + 1`
- cat $f
- fi
- done
-fi
-
-teststatus $ARG0 $totalfailed
=== removed file 'source/script/tests/tests_net.sh'
--- a/source/script/tests/tests_net.sh 2007-01-26 13:33:06 +0000
+++ b/source/script/tests/tests_net.sh 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
- $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl 2007-01-26 14:45:34 +0000
+++ b/source/script/tests/selftest.pl 2007-01-26 15:23:24 +0000
@@ -248,6 +248,8 @@
my $open_tests = {};
$test_output->{$name} = "";
while (<RESULT>) {
+ $test_output->{$name}.=$_;
+ print if ($opt_verbose);
if (/^test: (.+)\n/) {
$open_tests->{$1} = 1;
} elsif (/^(success|failure|skip|error): (.*?)( \[)?\n/) {
@@ -273,10 +275,8 @@
$statistics->{TESTS_ERROR}++;
}
}
- $test_output->{$name}.=$_;
- print if ($opt_verbose);
}
- $test_output->{$name}.="COMMAND IS: $cmd\n";
+ $test_output->{$name}.="COMMAND: $cmd\n";
foreach (keys %$open_tests) {
$test_output->{$name}.="$_ was started but never finished!\n";
$statistics->{TESTS_ERROR}++;
@@ -567,7 +567,7 @@
} else {
unless ($from_build_farm) {
- if (not $opt_immediate) {
+ if (not $opt_immediate and not $opt_verbose) {
foreach (@$suitesfailed) {
print
"===============================================================================\n";
print "FAIL: $_\n";
=== modified file 'source/script/tests/test_ejs.sh'
--- a/source/script/tests/test_ejs.sh 2007-01-26 13:33:06 +0000
+++ b/source/script/tests/test_ejs.sh 2007-01-26 15:23:24 +0000
@@ -22,16 +22,11 @@
export PATH
testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION
-
testit "samr.js" "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc:
-U$USERNAME%$PASSWORD
testit "echo.js" "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc:
-U$USERNAME%$PASSWORD
-
testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD
$DOMAIN ejstestuser
-
testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION
-
testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd`
$DATADIR/samba3/
-
testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM'
-U$USERNAME%$PASSWORD
testok $0 $failed
=== modified file 'source/script/tests/test_s3upgrade.sh'
--- a/source/script/tests/test_s3upgrade.sh 2005-09-26 18:16:38 +0000
+++ b/source/script/tests/test_s3upgrade.sh 2007-01-26 15:23:24 +0000
@@ -7,9 +7,16 @@
exit 1
fi
+SCRIPTDIR=../testprogs/ejs
+DATADIR=../testdata
+
+PATH=bin:$PATH
+export PATH
+
mkdir -p $PREFIX
rm -f $PREFIX/*
-$VALGRIND bin/smbscript ../testprogs/ejs/samba3sam
-$VALGRIND bin/smbscript ../testdata/samba3/verify ../testdata/samba3
-$VALGRIND bin/smbscript setup/upgrade --verify --targetdir=$PREFIX
../testdata/samba3 ../testdata/samba3/smb.conf
+. script/tests/test_functions.sh
+
+testit "parse samba3" bin/smbscript ../testdata/samba3/verify $CONFIGURATION
../testdata/samba3
+testit "upgrade" bin/smbscript setup/upgrade $CONFIGURATION --verify
--targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
=== modified file 'source/script/tests/tests_all.sh'
--- a/source/script/tests/tests_all.sh 2007-01-26 14:50:16 +0000
+++ b/source/script/tests/tests_all.sh 2007-01-26 15:23:24 +0000
@@ -12,3 +12,4 @@
$SRCDIR/script/tests/test_pidl.sh
$SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$PREFIX
$SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD ""
+ $SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade
=== modified file 'source/script/tests/tests_xterm.sh' (properties changed)
=== modified file 'testdata/samba3/verify'
--- a/testdata/samba3/verify 2005-08-31 16:51:09 +0000
+++ b/testdata/samba3/verify 2007-01-26 15:23:24 +0000
@@ -5,6 +5,13 @@
Written by Jelmer Vernooij, 2005.
*/
+var sys;
+var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
+if (options == undefined) {
+ println("Failed to parse options");
+ return -1;
+}
+
libinclude("base.js");
var path = substr(ARGV[0], 0, -strlen("verify"));
@@ -49,3 +56,4 @@
println("account policies ok");
+exit(0);
