Replace --pure-happens-before with --hybrid flag (disabled by default)

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

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

1 files changed, 6 insertions, 5 deletions

diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 45c1a8c..3b11aca 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -570,9 +570,10 @@ class ThreadSanitizerBase(object):
     return True
 
   def ExtendOptionParser(self, parser):
-    parser.add_option("", "--pure-happens-before", default="yes",
-                      dest="pure_happens_before",
-                      help="Less false reports, more missed races")
+    parser.add_option("", "--hybrid", default="no",
+                      dest="hybrid",
+                      help="Finds more data races, may give false positive "
+                      "reports unless the code is annotated")
     parser.add_option("", "--announce-threads", default="yes",
                       dest="announce_threads",
                       help="Show the the stack traces of thread creation")
@@ -605,8 +606,8 @@ class ThreadSanitizerBase(object):
     # This should shorten filepaths for functions intercepted in TSan.
     ret += ["--file-prefix-to-cut=scripts/tsan/tsan/"]
 
-    if self.EvalBoolFlag(self._options.pure_happens_before):
-      ret += ["--pure-happens-before=yes"] # "no" is the default value for TSAN
+    if self.EvalBoolFlag(self._options.hybrid):
+      ret += ["--hybrid=yes"] # "no" is the default value for TSAN
 
     if self.EvalBoolFlag(self._options.announce_threads):
       ret += ["--announce-threads"]