summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 02:24:52 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 02:24:52 +0000
commit98a15674263b71e3f9ea3d2a496a40bf98f756dd (patch)
tree80889b0c794b1d8ec6a663e29c2214152f698e18 /tools
parent512df7f666fe515772661db95543934ef4b199c5 (diff)
downloadchromium_src-98a15674263b71e3f9ea3d2a496a40bf98f756dd.zip
chromium_src-98a15674263b71e3f9ea3d2a496a40bf98f756dd.tar.gz
chromium_src-98a15674263b71e3f9ea3d2a496a40bf98f756dd.tar.bz2
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/valgrind_test.py19
1 files changed, 10 insertions, 9 deletions
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