r25740: More consistent naming for tests, always include environment name in test name.

(This used to be commit 9cfa44b43857df252336b6f88cfc0f7fcd557533)

4 files changed, 42 insertions, 40 deletions

diff --git a/source4/samba4-knownfail b/source4/samba4-knownfail
index d2a227a1dc..40d17b5d9b 100644
--- a/source4/samba4-knownfail
+++ b/source4/samba4-knownfail
@@ -1,11 +1,11 @@
-LOCAL-RESOLVE/async
-LOCAL-ICONV/next_codepoint()
+LOCAL-RESOLVE.*/async
+LOCAL-ICONV.*/next_codepoint()
 BASE-DELAYWRITE/finfo update on close
-BASE-DELETE/deltest20a
-BASE-DELETE/deltest20b
-RAW-OPLOCK/OPLOCK
+BASE-DELETE.*/deltest20a
+BASE-DELETE.*/deltest20b
+RAW-OPLOCK.*/OPLOCK
 RPC-WINREG
-LOCAL-REGISTRY/security # Not implemented yet
+LOCAL-REGISTRY.*/security # Not implemented yet
 RPC-WKSSVC.*NetWkstaGetInfo
 RPC-WKSSVC.*NetWkstaTransportEnum
 RPC-HANDLES.*/lsarpc-shared
diff --git a/source4/samba4-skip b/source4/samba4-skip
index a7b480c40b..d88f010511 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -17,22 +17,22 @@ BASE-UTABLE
 BASE-SMB
 SMB2-NOTIFY
 SMB2-SCAN
-ntvfs/cifs BASE-CHARSET
-ntvfs/cifs BASE-DEFER_OPEN
-ntvfs/cifs BASE-DELAYWRITE
-ntvfs/cifs BASE-IOMETER
-ntvfs/cifs BASE-CASETABLE
-ntvfs/cifs BASE-NTTRANS
-ntvfs/cifs BASE-SCAN-MAXFID
-ntvfs/cifs BASE-UTABLE
-ntvfs/cifs BASE-SMB
-ntvfs/cifs RAW-COMPOSITE
-ntvfs/cifs RAW-OPLOCK
-ntvfs/cifs RAW-NOTIFY
-ntvfs/cifs RAW-BENCH-OPLOCK
-ntvfs/cifs RAW-SCAN-EAMAX
-ntvfs/cifs RAW-CONTEXT
-ntvfs/cifs RAW-QFILEINFO-IPC
+ntvfs.cifs.BASE-CHARSET
+ntvfs.cifs.BASE-DEFER_OPEN
+ntvfs.cifs.BASE-DELAYWRITE
+ntvfs.cifs.BASE-IOMETER
+ntvfs.cifs.BASE-CASETABLE
+ntvfs.cifs.BASE-NTTRANS
+ntvfs.cifs.BASE-SCAN-MAXFID
+ntvfs.cifs.BASE-UTABLE
+ntvfs.cifs.BASE-SMB
+ntvfs.cifs.RAW-COMPOSITE
+ntvfs.cifs.RAW-OPLOCK
+ntvfs.cifs.RAW-NOTIFY
+ntvfs.cifs.RAW-BENCH-OPLOCK
+ntvfs.cifs.RAW-SCAN-EAMAX
+ntvfs.cifs.RAW-CONTEXT
+ntvfs.cifs.RAW-QFILEINFO-IPC
 RPC-DSSYNC
 RPC-SAMSYNC
 LDAP-UPTODATEVECTOR					# Segfaults
@@ -45,7 +45,7 @@ RPC-SVCCTL							# Not provided by Samba 4
 RPC-ATSVC							# Not provided by Samba 4
 RPC-FRSAPI							# Not provided by Samba 4
 .*SAMBA3.*							# Samba3-specific test
-^NET-DOMOPEN$						# Hangs for some reason
-^NET-API-BECOME-DC$					# Fails
+^samba4.NET-DOMOPEN.*$				# Hangs for some reason
+^samba4.NET-API-BECOME-DC.*$			# Fails
 WINBIND							# FIXME: This should not be skipped
 NSS-TEST						# Fails
diff --git a/source4/selftest/output/html.pm b/source4/selftest/output/html.pm
index 22488576b4..fbf433e8d1 100644
--- a/source4/selftest/output/html.pm
+++ b/source4/selftest/output/html.pm
@@ -40,7 +40,6 @@ sub new($$$$) {
 	print INDEX "  <table>\n";
 	print INDEX "  <tr>\n";
 	print INDEX "    <td class=\"tableHead\">Test</td>\n";
-	print INDEX "    <td class=\"tableHead\">Environment</td>\n";
 	print INDEX "    <td class=\"tableHead\">Result</td>\n";
 	print INDEX "  </tr>\n";
 
@@ -151,7 +150,6 @@ sub end_testsuite($$$$$)
 
 	print INDEX "<tr>\n";
 	print INDEX "  <td class=\"testSuite\"><a href=\"$state->{HTMLFILE}\">$state->{NAME}</a></td>\n";
-	print INDEX "  <td class=\"environment\">$state->{ENVNAME}</td>\n";
 	my $st = $self->{local_statistics};
 
 	if ($ret == $expected_ret) {
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 29b76fb89d..4f2a2cb445 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -12,7 +12,11 @@ plantest() {
 	shift 2
 	cmdline="$*"
 	echo "-- TEST --"
-	echo $name
+	if [ "$env" = "none" ]; then
+		echo "samba4.$name"
+	else
+		echo "samba4.$name ($env)"
+	fi
 	echo $env
 	echo $cmdline
 }
@@ -23,22 +27,22 @@ samba4srcdir=$incdir/..
 samba4bindir=$samba4srcdir/bin
 SCRIPTDIR=$samba4srcdir/../testprogs/ejs
 
-plantest "base.js" dc "$SCRIPTDIR/base.js" $CONFIGURATION
-plantest "samr.js" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
-plantest "echo.js" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
+plantest "js.base" dc "$SCRIPTDIR/base.js" $CONFIGURATION
+plantest "js.samr" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
+plantest "js.echo" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
 #plantest "ejsnet.js" dc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser
-plantest "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
-plantest "winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
+plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
+plantest "js.winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
 
 # Simple tests for LDAP and CLDAP
 
 for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
-    plantest "TESTING PROTOCOL ldap with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldap \$SERVER_IP $options
+    plantest "ldb.ldap with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldap \$SERVER_IP $options
 done
 # see if we support ldaps
 if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
     for options in "" "-U\$USERNAME%\$PASSWORD"; do
-	plantest "TESTING PROTOCOL ldaps with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldaps \$SERVER_IP $options
+	plantest "ldb.ldaps with options $options" dc $samba4srcdir/../testprogs/blackbox/test_ldb.sh ldaps \$SERVER_IP $options
     done
 fi
 for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATEVECTOR
@@ -52,7 +56,7 @@ LDBDIR=$samba4srcdir/lib/ldb
 export LDBDIR
 plantest "ldb" none $LDBDIR/tests/test-tdb.sh
 
-plantest "ejs ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
+plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
 
 # Tests for RPC
 
@@ -187,7 +191,7 @@ done
 
 # Tests against the NTVFS CIFS backend
 for t in $base $raw; do
-    plantest "ntvfs/cifs $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
+    plantest "ntvfs.cifs.$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
 done
 
 # Local tests
@@ -222,8 +226,8 @@ bbdir=$incdir/../../testprogs/blackbox
 plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" 
 plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" 
 plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" 
-plantest "blackbox.nmblookup:dc" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" 
-plantest "blackbox.nmblookup:member" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
+plantest "blackbox.nmblookup" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" 
+plantest "blackbox.nmblookup" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
 
 # Tests using the "Simple" NTVFS backend
 
@@ -234,7 +238,7 @@ done
 DATADIR=$samba4srcdir/../testdata
 
 plantest "parse samba3" none $samba4bindir/smbscript $DATADIR/samba3/verify $CONFIGURATION $DATADIR/samba3
-plantest "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+plantest "js.samba3sam" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
 
 rm -rf $PREFIX/upgrade
 mkdir -p $PREFIX/upgrade
@@ -252,7 +256,7 @@ plantest "wbinfo -a against member server with domain creds" member $VALGRIND $s
 NBT_TESTS=`$samba4bindir/smbtorture --list | grep "^NBT-" | xargs`
 
 for f in $NBT_TESTS; do
-	plantest "$f:$env" "dc" $samba4bindir/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD 
+	plantest $f dc $samba4bindir/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD 
 done
 
 WB_OPTS="${TORTURE_OPTIONS}"