Move tools/valgrind-webrtc -> tools-webrtc/valgrind

tools-webrtc/valgrind/webrtc_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Runs various WebRTC tests through valgrind_test.py.
@@ skipping 48 matching lines @@
 
     # Add gtest filters, if found.
     chrome_tests.ChromeTests._AppendGtestFilter(self, tool, self._test_name,
                                                 cmd)
 
     # When ChromeTests._DefaultCommand has executed, it has setup suppression
     # files based on what's found in the memcheck/ subdirectory of
     # this script's location. If Mac or Windows is executing, additional
     # platform specific files have also been added.
     # Since only the ones located below this directory are added, we must also
-    # add the ones maintained by Chrome, located in ../valgrind.
+    # add the ones maintained by Chrome, located in ../../tools/valgrind.
 
     # The idea is to look for --suppression arguments in the cmd list and add a
     # modified copy of each suppression file, for the corresponding file in
-    # ../valgrind. If we would simply replace 'valgrind-webrtc' with 'valgrind'
-    # we may produce invalid paths if other parts of the path contain that
-    # string. That's why the code below only replaces the end of the path.
+    # ../../tools/valgrind.
     script_dir = path_utils.ScriptDir()
-    old_base, _ = os.path.split(script_dir)
-    new_dir = os.path.join(old_base, 'valgrind')
+    checkout_src = os.path.abspath(os.path.join(script_dir, os.pardir,
+                                                os.pardir))
+    new_dir = os.path.join(checkout_src, 'tools', 'valgrind')
     add_suppressions = []
     for token in cmd:
       if '--suppressions' in token:
         add_suppressions.append(token.replace(script_dir, new_dir))
     return add_suppressions + cmd
 
 
 def main(_):
   parser = optparse.OptionParser(
       'usage: %prog -b <dir> -t <test> -- <test args>')
@@ skipping 54 matching lines @@
   if options.build_dir and not test_executable.startswith(options.build_dir):
     test_executable = os.path.join(options.build_dir, test_executable)
   args = [test_executable] + args
 
   test = WebRTCTest(options.test, options, args, 'cmdline')
   return test.Run()
 
 if __name__ == '__main__':
   return_code = main(sys.argv)
   sys.exit(return_code)