diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 15:24:44 -0700 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 15:24:44 -0700 |
commit | ead126caace0cd94ab515f5d9f2199b60a84f914 (patch) | |
tree | 3778093012c4216674321416788072f497ac3a4b /source4/selftest/slow | |
parent | 8853babb504298bd87fb5cae2120f2be63b08312 (diff) | |
parent | db67f43aefccccedbd8bf59c7d97c99295b7a168 (diff) | |
download | samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.gz samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.bz2 samba-ead126caace0cd94ab515f5d9f2199b60a84f914.zip |
Merge branch 'v4-0-stable' into newmaster
Diffstat (limited to 'source4/selftest/slow')
-rw-r--r-- | source4/selftest/slow | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/slow b/source4/selftest/slow index 6501a0cbf0..7c2090c0e6 100644 --- a/source4/selftest/slow +++ b/source4/selftest/slow @@ -1,4 +1,4 @@ -# This file contains regexes matching tests that are very slow and +# This file contains regexes matching tests that are very slow and # should be skipped during a normal test run. .*base.bench.holdcon.* # Slow raw.bench.lookup # Slow @@ -6,3 +6,4 @@ 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 +.*stress.* # Slow |