summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt1
-rwxr-xr-xtools/valgrind/waterfall.sh2
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)