Move all googletest related scripts into googletest/

googletest/fix_test_cases.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs through isolate_test_cases.py all the tests cases in a google-test
 executable, grabs the failures and traces them to generate a new .isolate.
 
 This scripts requires a .isolated file. This file is generated from a .isolate
 file. You can use 'GYP_DEFINES=test_isolation_mode=check ninja foo_test_run' to
 generate it.
 """
 
 import json
 import logging
 import os
 import subprocess
 import sys
 import tempfile
 
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+if not ROOT_DIR in sys.path:
+  sys.path.insert(0, ROOT_DIR)
+
 import isolate
 import isolate_test_cases
+import run_isolated
 import run_test_cases
 
-ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 def with_tempfile(function):
   """Creates a temporary file and calls the inner function."""
   def hook(*args, **kwargs):
     handle, tempfilepath = tempfile.mkstemp(prefix='fix_test_cases')
     os.close(handle)
     try:
       return function(tempfilepath, *args, **kwargs)
     finally:
@@ skipping 79 matching lines @@
   assert bool(retcode) == (failures is None or bool(failures))
   return success, failures
 
 
 @with_tempfile
 def trace_some(tempfilepath, isolated, test_cases, verbosity):
   """Traces the test cases."""
   with open(tempfilepath, 'w') as f:
     f.write('\n'.join(test_cases))
   cmd = [
-    sys.executable, os.path.join(ROOT_DIR, 'isolate_test_cases.py'),
+    sys.executable, os.path.join(
+        ROOT_DIR, 'googletest', 'isolate_test_cases.py'),
     '--isolated', isolated,
     '--test-case-file', tempfilepath,
     # Do not use --run-all here, we assume the test cases will pass inside the
     # checkout.
   ]
   add_verbosity(cmd, verbosity)
   logging.debug(cmd)
   return subprocess.call(cmd)
 
 
@@ skipping 67 matching lines @@
 
     # Trace the test cases and update the .isolate file.
     print('\nTracing the %d failing tests.' % len(failures))
     if trace_some(isolated, failures, verbosity):
       logging.info('The tracing itself failed.')
       return False
     previous_failures.update(failures)
 
 
 def main():
-  run_test_cases.run_isolated.disable_buffering()
+  run_isolated.disable_buffering()
   parser = run_test_cases.OptionParserTestCases(
       usage='%prog <options> -s <something.isolated>')
   parser.add_option(
       '-s', '--isolated',
       help='The isolated file')
   options, args = parser.parse_args()
 
   if args:
     parser.error('Unsupported arg: %s' % args)
   isolate.parse_isolated_option(parser, options, os.getcwd(), True)
 
   _, command, test_cases = isolate_test_cases.safely_load_isolated(
       parser, options)
   if not command:
     parser.error('A command must be defined')
   if not test_cases:
     parser.error('No test case to run')
   return not fix_all(options.isolated, test_cases, options.verbose)
 
 
 if __name__ == '__main__':
   sys.exit(main())