Made chrome_test to fail when the test itself failed.

Exclude tests that does not pass on valgrind

BUG=29578,29579,29853,29586,29587,29592,29598
TEST=run valgrind test

Review URL: http://codereview.chromium.org/466047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34403 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 39 insertions, 9 deletions

diff --git a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt b/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
index 33f41c1..403af17 100644
--- a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
+++ b/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
@@ -3,3 +3,6 @@
 # (see https://bugs.kde.org/show_bug.cgi?id=192634 and
 # http://code.google.com/p/data-race-test/issues/detail?id=11)
 WorkerPoolTest.PostTask
+
+# http://crbug.com/29855.
+StackTrace.OutputToStream
diff --git a/chrome/test/data/valgrind/ui_tests.gtest.txt b/chrome/test/data/valgrind/ui_tests.gtest.txt
index bdbff17..e99ae18 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest.txt
@@ -33,3 +33,13 @@ TabRestoreUITest.*
 # See http://crbug.com/25176
 ProcessSingletonLinuxTest.NotifyOtherProcessFailure
 ProcessSingletonLinuxTest.NotifyOtherProcessDifferingHost
+
+# These tests fail under valgrind.
+# See http://crbug.com/29579.
+AutomationProxyTest.NavigateToURLWithTimeout1
+AutomationProxyTest.NavigateToURLWithTimeout2
+# See http://crbug.com/29586.
+NewTabUITest.ChromeInternalLoadsNTP
+# See http://crbug.com/29592.
+WorkerTest.MultipleWorkers
+
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
index 8df305f..9bba3b8 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
@@ -23,3 +23,19 @@ DownloadTest.IncognitoDownload
 DownloadTest.NoDownload
 DownloadTest.PerWindowShelf
 ErrorPageTest.IFrameDNSError_GoBackAndForward
+
+# Following tests are failing on valgrind.
+# See http://crbug.com/29598.
+BrowserEncodingTest.TestEncodingAutoDetect
+DOMStorageTest.FLAKY_LocalStorageLayoutTests
+ErrorPageTest.FLAKY_DNSError_Basic
+ErrorPageTest.FLAKY_DNSError_GoBack1
+ErrorPageTest.FLAKY_DNSError_GoBack2 
+ErrorPageTest.FLAKY_DNSError_GoBack2AndForward
+ErrorPageTest.FLAKY_DNSError_GoBack2Forward2
+NewTabUITest.NTPHasThumbnails
+NewTabUITest.UpdateUserPrefsVersion
+SessionHistoryTest.FLAKY_LocationReplace
+WorkerTest.FLAKY_LimitTotal
+WorkerTest.LimitPerPage
+WorkerTest.WorkerXhrHttpLayoutTests
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index ecc504d..fa164e5 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -260,11 +260,7 @@ class ValgrindTool(object):
     os.putenv("GTEST_DEATH_TEST_USE_FORK", "1")
     logging.info("export GTEST_DEATH_TEST_USE_FORK=1");
 
-    common.RunSubprocess(proc, self._timeout)
-
-    # Always return true, even if running the subprocess failed. We depend on
-    # Analyze to determine if the run was valid.
-    return True
+    return common.RunSubprocess(proc, self._timeout)
 
   def Analyze(self):
     raise RuntimeError, "This method should be implemented " \
@@ -279,12 +275,17 @@ class ValgrindTool(object):
 
   def RunTestsAndAnalyze(self):
     self.PrepareForTest()
-    self.Execute()
+    exec_retcode = self.Execute()
+    analyze_retcode = self.Analyze()
 
-    retcode = self.Analyze()
-    if retcode:
+    if analyze_retcode:
       logging.error("Analyze failed.")
-      return retcode
+      return analyze_retcode
+
+    if exec_retcode:
+      logging.error("Test Execution failed.")
+      return exec_retcode
+
     logging.info("Execution and analysis completed successfully.")
     return 0