summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-30 04:12:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-30 04:12:39 +0200
commit46f22add9ae03b95f4b22235c297737475427f41 (patch)
tree2c3808c73ff908b9e0e9a2d4f6af0a80038ffa7e /source4
parent39f50afc579f208300c3c1fcc612ca9b69bb76e3 (diff)
downloadsamba-46f22add9ae03b95f4b22235c297737475427f41.tar.gz
samba-46f22add9ae03b95f4b22235c297737475427f41.tar.bz2
samba-46f22add9ae03b95f4b22235c297737475427f41.zip
Make sure reason for skipping is output.
(This used to be commit 2d1cac54dec1aed9e5258bd44bdd236b5dc92224)
Diffstat (limited to 'source4')
-rw-r--r--source4/samba4-slow10
-rwxr-xr-xsource4/selftest/samba4_tests.sh1
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/samba4-slow b/source4/samba4-slow
index e4387c1958..d414368de8 100644
--- a/source4/samba4-slow
+++ b/source4/samba4-slow
@@ -1,7 +1,7 @@
# This file contains regexes matching tests that are very slow and
# should be skipped during a normal test run.
-.*base.bench.holdcon.*
-raw.bench.lookup
-base.utable
-base.smb
-rpc.scanner
+.*base.bench.holdcon.* # Slow
+raw.bench.lookup # Slow
+base.utable # Slow
+base.smb # Slow
+rpc.scanner # Slow
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 9693451c47..860a54f80c 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -65,7 +65,6 @@ smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
plantest "js.base" dc "$SCRIPTDIR/base.js" $CONFIGURATION
plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION -d 10
-plantest "js.winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
# Simple tests for LDAP and CLDAP