Remove a temporary hack from the Dr. Memory runner;

+ Move a couple of commented lines
TBR=glider
Review URL: http://codereview.chromium.org/4177003

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

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index fcd2000..da748e6 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -738,9 +738,6 @@ class DrMemory(BaseTool):
                           "with the path to drmemory.exe"
     proc = pin_cmd.split(" ")
 
-    # Dump Dr.Memory events on error
-    # proc += ["-dr_ops", "dumpcore_mask 0x8bff"]
-
     suppression_count = 0
     for suppression_file in self._options.suppressions:
       if os.path.exists(suppression_file):
@@ -752,6 +749,9 @@ class DrMemory(BaseTool):
     if not suppression_count:
       logging.warning("WARNING: NOT USING SUPPRESSIONS!")
 
+    # Un-comment to dump Dr.Memory events on error
+    #proc += ["-dr_ops", "-dumpcore_mask 0x8bff"]
+
     proc += ["-logdir", self.temp_dir]
     proc += ["-batch", "-quiet"]
     proc += ["-no_check_leaks", "-no_count_leaks"]
@@ -760,7 +760,6 @@ class DrMemory(BaseTool):
     proc += ["--"]
 
     # Note that self._args begins with the name of the exe to be run.
-    self._args[0] += ".exe" # HACK
     proc += self._args
     return proc