[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Nov 17 22:53:31 MST 2009


The branch, master has been updated
       via  575967a... s4:selftest: fix logic for --option=torture:progress=no
       via  63ff7a8... s4:torture/test_gentest.sh: make use of the PREFIX argument
       via  35775c2... selftest: ignore empty lines in knownfailures
       via  053fa03... selftest/output/plain.pm: report the testuite name on error
       via  e3032d5... s4:selftest: for now skip the BASE-DELAY-WRITE test completely
       via  e67445b... s4:selftest: avoid running the slow BASE-DELAY-WRITE test on the cifs proxy share
       via  b4c916c... s4:selftest: add "rpc.netlogon.*.GetDomainInfo"
      from  e73b790... fixed the build

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 575967a5cf2f512ae25e5376bb49b133c6d5fc2d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 16:58:11 2009 +0100

    s4:selftest: fix logic for --option=torture:progress=no
    
    metze

commit 63ff7a8db15b4de906093ea793721f99a93692b6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 15:23:39 2009 +0100

    s4:torture/test_gentest.sh: make use of the PREFIX argument
    
    We should not use hardcode pathes!
    
    metze

commit 35775c24d36c8359d3564fee7c7c5b3c6086213b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 16:59:20 2009 +0100

    selftest: ignore empty lines in knownfailures
    
    metze

commit 053fa03cd74bc6eeeaea0f21baa3680ef9e21ebe
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 17:30:14 2009 +0100

    selftest/output/plain.pm: report the testuite name on error
    
    metze

commit e3032d5fc8c77aae9de990d40eac764f14376d2f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 12:03:54 2009 +0100

    s4:selftest: for now skip the BASE-DELAY-WRITE test completely
    
    This test randomly fails depending on the timing
    (the tests are too strict with the values introduced in
    commit 0fca2b078ceb314e429e24e3318b50451ccf423b)
    and local filesystem features (timestamp resolution).
    
    metze

commit e67445b7f714ed2c04cd684dc6171d2cf7c6345a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 17 11:59:21 2009 +0100

    s4:selftest: avoid running the slow BASE-DELAY-WRITE test on the cifs proxy share
    
    It's enough to run it on the posix share.
    
    metze

commit b4c916c492566611afd1bfb19b366f4fff5043a3
Author: Stefan Metzmacher <metze at sernet.private>
Date:   Mon Nov 16 16:54:53 2009 +0100

    s4:selftest: add "rpc.netlogon.*.GetDomainInfo"
    
    We need to expand the test to work against w2k8 and w2k8r2...
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 selftest/Subunit/Filter.pm            |    1 +
 selftest/output/plain.pm              |    6 +++++-
 source4/selftest/knownfail            |    1 +
 source4/selftest/skip                 |    1 +
 source4/selftest/slow                 |    1 +
 source4/selftest/tests.sh             |    2 +-
 source4/torture/tests/test_gentest.sh |   11 ++++++-----
 7 files changed, 16 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index b7df762..3c22695 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -15,6 +15,7 @@ sub read_test_regexes($)
 	while (<LF>) { 
 		chomp; 
 		next if (/^#/);
+		next if (/^$/);
 		if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) {
 			push (@ret, [$1, $4]);
 		} else {
diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 5e75ce9..066cacf 100644
--- a/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
@@ -113,10 +113,14 @@ sub end_testsuite($$$$)
 	my $out = "";
 	my $unexpected = 0;
 
+	if (not defined($self->{test_output}->{$name})) {
+		print "no output for name[$name]\n";
+	}
+
 	if ($result eq "success" or $result eq "xfail") {
 		$self->{suites_ok}++;
 	} else {
-		$self->output_msg("ERROR: $reason\n");
+		$self->output_msg("ERROR: Testsuite[$name]\nREASON: $reason\n");
 		push (@{$self->{suitesfailed}}, $name);
 		if ($self->{immediate} and not $self->{verbose}) {
 			$out .= $self->{test_output}->{$name};
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 15174fe..2f75760 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -38,6 +38,7 @@ rpc.netlogon.*.GetPassword
 rpc.netlogon.*.GetTrustPasswords
 rpc.netlogon.*.DatabaseRedo
 rpc.netlogon.*.ServerGetTrustInfo
+rpc.netlogon.*.GetDomainInfo # Also fails against W2K8 (but in a different way)
 samba4.rpc.samr.passwords.pwdlastset # Not provided by Samba 4 yet
 samba4.rpc.samr.users.privileges
 samba4.rpc.spoolss.printer # Not provided by Samba 4 yet
diff --git a/source4/selftest/skip b/source4/selftest/skip
index 2875acc..7003cee 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -69,3 +69,4 @@ trans2.scan # uses huge number of file descriptors
 base.scan.ioctl # bad idea in make test
 base.scan.pipe_number # bad idea in make test
 base.secleak # no point on build farm
+base.delaywrite # This is randomly failing, depending on timing and filesystem features
diff --git a/source4/selftest/slow b/source4/selftest/slow
index d414368..6501a0c 100644
--- a/source4/selftest/slow
+++ b/source4/selftest/slow
@@ -5,3 +5,4 @@ raw.bench.lookup				# Slow
 base.utable						# Slow
 base.smb						# Slow
 rpc.scanner						# Slow
+ntvfs.cifs.base.delaywrite	# It's a slow test and having it on the proxy share is not needed
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 6130e91..8888637 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -101,7 +101,7 @@ TORTURE_OPTIONS="$TORTURE_OPTIONS $CONFIGURATION"
 TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
 TORTURE_OPTIONS="$TORTURE_OPTIONS --target=$SELFTEST_TARGET"
 TORTURE_OPTIONS="$TORTURE_OPTIONS --basedir=$prefix_abs"
-if [ -n "$SELFTEST_VERBOSE" ]; then
+if [ -z "$SELFTEST_VERBOSE" ]; then
 	TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no"
 fi
 TORTURE_OPTIONS="$TORTURE_OPTIONS --format=subunit"
diff --git a/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index c7f66c8..ad9ecd6 100755
--- a/source4/torture/tests/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
@@ -5,7 +5,7 @@
 
 if [ $# -lt 4 ]; then
 cat <<EOF
-Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
+Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
 EOF
 exit 1;
 fi
@@ -14,7 +14,8 @@ SERVER=$1
 USERNAME=$2
 PASSWORD=$3
 DOMAIN=$4
-shift 4
+PREFIX=$5
+shift 5
 failed=0
 
 samba4bindir="$BUILDDIR/bin"
@@ -22,13 +23,13 @@ gentest="$samba4bindir/gentest$EXEEXT"
 
 . `dirname $0`/../../../testprogs/blackbox/subunit.sh
 
-cat <<EOF > st/gentest.ignore
+cat <<EOF > $PREFIX/gentest.ignore
 all_info.out.fname
 internal_information.out.file_id
 EOF
 
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=$PREFIX/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
 
-rm -f st/gentest.ignore
+rm -f $PREFIX/gentest.ignore
 
 exit $failed


-- 
Samba Shared Repository


More information about the samba-cvs mailing list