selftest: Don't skip Samba3 tests in the top level build

The regular expressions here were not specific enough, they matched
the samba3. names from the source3/selftest/tests.py

Found by Andreas Schneider

Andrew Bartlett

1 files changed, 64 insertions, 56 deletions

diff --git a/source4/selftest/skip b/source4/selftest/skip
index da79467f55..9db5d05c45 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -18,69 +18,77 @@
 #
 # Please add a comment for each testsuite you disable explaining why
 # it is being skipped.
-raw.composite
-base.iometer
-base.casetable
-base.nttrans
-base.scan.maxfid
-hold.oplock		# Not a test, but a way to block other clients for a test
-raw.ping.pong		# Needs second server to test
-rpc.samr.accessmask
-raw.scan.eamax
+^samba4.raw.composite
+^samba4.base.iometer
+^samba4.base.casetable
+^samba4.base.nttrans
+^samba4.base.scan.maxfid
+^samba4.raw.hold-oplock 		# Not a test, but a way to block other clients for a test
+^samba4.smb2.hold-oplock 		# Not a test, but a way to block other clients for a test
+^samba4.raw.ping.pong		# Needs second server to test
+^samba4.rpc.samr.accessmask
+^samba4.raw.scan.eamax
 samba4.ntvfs.cifs.raw.qfileinfo.ipc
-smb2.notify
-smb2.scan
-smb2.lease
-smb2.durable.open
-smb2.dir
-ntvfs.cifs.base.charset
-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.notify
-ntvfs.cifs.raw.scan-eamax
-ntvfs.cifs.raw.context
-ntvfs.cifs.raw.qfileinfo.ipc
-samba4.rpc.samsync
-samba4.rpc.remact							# Not provided by Samba 4
-samba4.rpc.oxidresolve						# Not provided by Samba 4
-samba4.rpc.eventlog						# Not provided by Samba 4
-samba4.rpc.initshutdown					# Not provided by Samba 4
-samba4.rpc.spoolss						# Not provided by Samba 4
-samba4.rpc.svcctl							# Not provided by Samba 4
-samba4.rpc.atsvc							# Not provided by Samba 4
-samba4.rpc.frsapi							# Not provided by Samba 4
-samba4.rpc.ntsvcs							# Not provided by Samba 4
-samba4.rpc.dfs								# Not provided by Samba 4
-samba4.rpc.lsa.forest							# Not provided by Samba 4
+^samba4.smb2.notify
+^samba4.smb2.scan
+^samba4.smb2.lease
+^samba4.smb2.durable.open
+^samba4.smb2.dir
+^samba4.ntvfs.cifs.base.charset
+^samba4.ntvfs.cifs.base.iometer
+^samba4.ntvfs.cifs.base.casetable
+^samba4.ntvfs.cifs.base.nttrans
+^samba4.ntvfs.cifs.base.scan-maxfid
+^samba4.ntvfs.cifs.base.utable
+^samba4.ntvfs.cifs.base.smb
+^samba4.ntvfs.cifs.raw.composite
+^samba4.ntvfs.cifs.raw.notify
+^samba4.ntvfs.cifs.raw.scan-eamax
+^samba4.ntvfs.cifs.raw.context
+^samba4.ntvfs.cifs.raw.qfileinfo.ipc
+^samba4.rpc.samsync
+^samba4.rpc.remact							# Not provided by Samba 4
+^samba4.rpc.oxidresolve						# Not provided by Samba 4
+^samba4.rpc.eventlog						# Not provided by Samba 4
+^samba4.rpc.initshutdown					# Not provided by Samba 4
+^samba4.rpc.spoolss						# Not provided by Samba 4
+^samba4.rpc.svcctl							# Not provided by Samba 4
+^samba4.rpc.atsvc							# Not provided by Samba 4
+^samba4.rpc.frsapi							# Not provided by Samba 4
+^samba4.rpc.ntsvcs							# Not provided by Samba 4
+^samba4.rpc.dfs								# Not provided by Samba 4
+^samba4.rpc.lsa.forest							# Not provided by Samba 4
 ^samba4.base.samba3.*						# Samba3-specific test
 ^samba4.ntvfs.cifs.base.samba3.*				# Samba3-specific test
 ^samba4.raw.samba3.*						# Samba3-specific test
 ^samba4.ntvfs.cifs.raw.samba3.*					# Samba3-specific test
-samba4.ntvfs.cifs.raw.
+^samba4.ntvfs.cifs.raw.
 ^samba4.rpc..*samba3.*						# Samba3-specific test
 ^samba4.samba-tool.domopen.*$				# Hangs for some reason
-nss.test						# Fails
-raw.offline 			# Samba 4 doesn't have much offline support yet
-rpc.autoidl  # this one just generates a lot of noise, and is no longer useful
-samba4.rpc.countcalls # this is not useful now we have full IDL
-samba4.rap.scan # same thing here - we have docs now
-samba4.rap.printing # Not provided by Samba 4
-samba4.rap.sam # Not provided by Samba 4
-samba4.gensec.python # not finished
+^samba4.nss.test						# Fails
+^samba4.raw.offline 			# Samba 4 doesn't have much offline support yet
+^samba4.rpc.autoidl  # this one just generates a lot of noise, and is no longer useful
+^samba4.rpc.countcalls # this is not useful now we have full IDL
+^samba4.rap.scan # same thing here - we have docs now
+^samba4.rap.printing # Not provided by Samba 4
+^samba4.rap.sam # Not provided by Samba 4
+^samba4.gensec.python # not finished
 bench # don't run benchmarks in our selftest
-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
-base.winattr
-base.birthtime
-smb2.acls # new test which doesn't pass yet
+^samba4.ntvfs.cifs.trans2.scan 
+^samba4.trans2.scan # uses huge number of file descriptors
+^samba4.ntvfs.cifs.base.scan.ioctl
+^samba4.base.scan.ioctl # bad idea in make test
+^samba4.ntvfs.cifs.base.scan.pipe_number
+^samba4.base.scan.pipe_number # bad idea in make test
+^samba4.ntvfs.cifs.base.secleak
+^samba4.base.secleak # no point on build farm
+^samba4.ntvfs.cifs.base.delaywrite
+^samba4.base.delaywrite # This is randomly failing, depending on timing and filesystem features
+^samba4.ntvfs.cifs.base.winattr
+^samba4.base.winattr
+^samba4.ntvfs.cifs.base.birthtime
+^samba4.base.birthtime
+^samba4.smb2.acls # new test which doesn't pass yet
 # ktutil might not be installed or from mit...
 # we should build a samba4ktutil and use that instead
-samba4.blackbox.ktpass # this test isn't portable ...
+^samba4.blackbox.ktpass # this test isn't portable ...