| Index: googletest/fix_test_cases.py
|
| diff --git a/fix_test_cases.py b/googletest/fix_test_cases.py
|
| similarity index 96%
|
| rename from fix_test_cases.py
|
| rename to googletest/fix_test_cases.py
|
| index 3b28925aacd7b5974023df9e0f4189a7b2339015..49563365e4560f0c75356742673691e8d2415b91 100755
|
| --- a/fix_test_cases.py
|
| +++ b/googletest/fix_test_cases.py
|
| @@ -18,11 +18,15 @@ 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):
|
| @@ -122,7 +126,8 @@ def trace_some(tempfilepath, isolated, test_cases, verbosity):
|
| 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
|
| @@ -210,7 +215,7 @@ def fix_all(isolated, all_test_cases, verbosity):
|
|
|
|
|
| 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(
|
|
|