diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 09:35:15 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 09:35:15 +0000 |
| commit | 38a8cd88f853d0a30e6537db10b12a07998728a8 (patch) | |
| tree | 3df32fb56b22a996940cc46a41e7ec2a2e70ff36 | |
| parent | ed7846c34aa8acf618dcd9ff869fc9a93137f9c0 (diff) | |
| download | chromium_src-38a8cd88f853d0a30e6537db10b12a07998728a8.zip chromium_src-38a8cd88f853d0a30e6537db10b12a07998728a8.tar.gz chromium_src-38a8cd88f853d0a30e6537db10b12a07998728a8.tar.bz2 | |
[GTTF] Automatically append FLAKY_ and FAILS_ prefixes to gtest_filters.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2765002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49240 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/data/valgrind/ui_tests.gtest_linux.txt | 2 | ||||
| -rw-r--r-- | chrome/test/data/valgrind/ui_tests.gtest_mac.txt | 24 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 11 |
3 files changed, 24 insertions, 13 deletions
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt index ba34512..3f61fb2 100644 --- a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt +++ b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt @@ -8,7 +8,7 @@ UnloadTest.CrossSiteInfiniteBeforeUnloadSync # See http://crbug.com/40584 ExtensionProxyUITest.* # See http://crbug.com/42105 -BrowserTest.FLAKY_PosixSessionEnd +BrowserTest.PosixSessionEnd # See http://crbug.com/42921 ResourceDispatcherTest.CrossSiteAfterCrash # See http://crbug.com/45562 diff --git a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt index 02a30db..daa01ca 100644 --- a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt +++ b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt @@ -28,13 +28,13 @@ ErrorPageTest.IFrameDNSError_GoBackAndForward # See http://crbug.com/30366. BrowserEncodingTest.TestEncodingAutoDetect # See http://crbug.com/29598. -DOMStorageTest.FLAKY_LocalStorageLayoutTests -ErrorPageTest.FLAKY_DNSError_Basic -ErrorPageTest.FLAKY_DNSError_GoBack1 -ErrorPageTest.FLAKY_DNSError_GoBack2 -ErrorPageTest.FLAKY_DNSError_GoBack2AndForward -ErrorPageTest.FLAKY_DNSError_GoBack2Forward2 -SessionHistoryTest.FLAKY_LocationReplace +DOMStorageTest.LocalStorageLayoutTests +ErrorPageTest.DNSError_Basic +ErrorPageTest.DNSError_GoBack1 +ErrorPageTest.DNSError_GoBack2 +ErrorPageTest.DNSError_GoBack2AndForward +ErrorPageTest.DNSError_GoBack2Forward2 +SessionHistoryTest.LocationReplace # See http://crbug.com/30367. NewTabUITest.NTPHasThumbnails NewTabUITest.UpdateUserPrefsVersion @@ -48,23 +48,23 @@ NPAPITester.GetURL NPAPITester.SelfDeletePluginGetUrl NPAPITester.PluginThreadAsyncCall NPAPITester.GetJavaScriptURL -NPAPITester.FLAKY_SelfDeletePluginInvoke +NPAPITester.SelfDeletePluginInvoke NPAPITester.NPObjectReleasedOnDestruction NPAPITester.Arguments -NPAPITester.FLAKY_GetJavaScriptURL2 +NPAPITester.GetJavaScriptURL2 NPAPITester.PrivateDisabled NPAPITester.NPObjectSetException NPAPIVisiblePluginTester.PluginReferrerTest NPAPIVisiblePluginTester.GetURLRequestFailWrite NPAPIIncognitoTester.PrivateEnabled NPAPITester.ManyPlugins -NPAPITester.FLAKY_ManyPlugins +NPAPITester.ManyPlugins NPAPITester.NPObjectProxy NPAPITester.ScheduleTimer NPAPIVisiblePluginTester.SelfDeletePluginInNewStream NPAPIVisiblePluginTester.MultipleInstancesSyncCalls NPAPIVisiblePluginTester.PluginConvertPointTest -NPAPIVisiblePluginTester.FLAKY_SelfDeletePluginInvokeInSynchronousPaint +NPAPIVisiblePluginTester.SelfDeletePluginInvokeInSynchronousPaint LayoutPluginTester.UnloadNoCrash # Possible timing related failure triggered only on mac valgrind bots. @@ -80,4 +80,4 @@ ChromeMainTest.AppLaunch # See http://crbug.com/39057 # Hanging on mac valgrind ui bots. -UnoadTest.*CrossSiteInfiniteBeforeUnloadAsync +UnloadTest.CrossSiteInfiniteBeforeUnloadAsync diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 9e1967c..01ef652 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -180,7 +180,18 @@ class ChromeTests: if line.startswith("#") or line.startswith("//") or line.isspace(): continue line = line.rstrip() + test_prefixes = ["FLAKY", "FAILS"] + for p in test_prefixes: + # Strip prefixes from the test names. + line = line.replace(".%s_" % p, ".") + # Exclude the original test name. filters.append(line) + if line[-2:] != ".*": + # List all possible prefixes if line doesn't end with ".*". + for p in test_prefixes: + filters.append(line.replace(".", ".%s_" % p)) + # Get rid of duplicates. + filters = set(filters) gtest_filter = self._gtest_filter if len(filters): if gtest_filter: |