diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 10:27:09 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 10:27:09 +0000 |
| commit | 5cf520eb832cb1acc953d79602f60552a03082e9 (patch) | |
| tree | c6ab7c9ab7d8c643e8095bb26d37285ad380f3c1 /tools | |
| parent | f726d413812b74af673cb4faa31ed758ef840923 (diff) | |
| download | chromium_src-5cf520eb832cb1acc953d79602f60552a03082e9.zip chromium_src-5cf520eb832cb1acc953d79602f60552a03082e9.tar.gz chromium_src-5cf520eb832cb1acc953d79602f60552a03082e9.tar.bz2 | |
Don't run ErrorPageTest.DNSError_GoBack2 under TSan
Also, extend the test name regexp in the waterfall.sh script
BUG=46643
TEST=TSan/UI(1) goes greener
TBR=glider
Review URL: http://codereview.chromium.org/6698025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt | 1 | ||||
| -rwxr-xr-x | tools/valgrind/waterfall.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt index f0b9fde..7edbd94 100644 --- a/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt +++ b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt @@ -15,6 +15,7 @@ UnloadTest.CrossSiteInfiniteUnloadSync # ErrorPageTest hang flakily, see http://crbug.com/46643 ErrorPageTest.DNSError_Basic +ErrorPageTest.DNSError_GoBack2 # These tests fail due to timeouts under TSan and hang the UI test runner, # http://crbug.com/61579 diff --git a/tools/valgrind/waterfall.sh b/tools/valgrind/waterfall.sh index cd19a12..1687cf2 100755 --- a/tools/valgrind/waterfall.sh +++ b/tools/valgrind/waterfall.sh @@ -83,7 +83,7 @@ fetch_logs() { REPORT_URLS=$(grep -o "[0-9]\+/steps/memory.*/logs/[0-9A-F]\{16\}" \ "$TMPFILE" || true) # `true` is to succeed on empty output - FAILED_TESTS=$(grep -o "[0-9]\+/steps/memory.*/logs/[A-Za-z0-9.]\+" \ + FAILED_TESTS=$(grep -o "[0-9]\+/steps/memory.*/logs/[A-Za-z0-9_.]\+" \ "$TMPFILE" | grep -v "[0-9A-F]\{16\}" | grep -v "stdio" \ || true) |