| Index: googletest/trace_test_cases.py
|
| diff --git a/trace_test_cases.py b/googletest/trace_test_cases.py
|
| similarity index 96%
|
| rename from trace_test_cases.py
|
| rename to googletest/trace_test_cases.py
|
| index 25aedba6dec86c1ce5509a48ac800a220ed5e5f6..85a3b8b22e7c6c41a7d3494ecdfb17d77efa1e42 100755
|
| --- a/trace_test_cases.py
|
| +++ b/googletest/trace_test_cases.py
|
| @@ -16,12 +16,14 @@ import re
|
| import sys
|
| import time
|
|
|
| +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 run_isolated
|
| import run_test_cases
|
| import trace_inputs
|
|
|
| -BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
| -ROOT_DIR = os.path.dirname(os.path.dirname(BASE_DIR))
|
| -
|
|
|
| def sanitize_test_case_name(test_case):
|
| """Removes characters that are valid as test case names but invalid as file
|
| @@ -148,7 +150,7 @@ def write_details(logname, outfile, root_dir, blacklist, results):
|
|
|
| def main():
|
| """CLI frontend to validate arguments."""
|
| - run_test_cases.run_isolated.disable_buffering()
|
| + run_isolated.disable_buffering()
|
| parser = run_test_cases.OptionParserTestCases(
|
| usage='%prog <options> [gtest]')
|
| parser.format_description = lambda *_: parser.description
|
| @@ -168,7 +170,7 @@ def main():
|
| 'like xvfb, start this script from *inside* xvfb, it\'ll be much faster'
|
| '.')
|
|
|
| - cmd = run_test_cases.fix_python_path(args)
|
| + cmd = run_isolated.fix_python_path(args)
|
| cmd[0] = os.path.abspath(cmd[0])
|
| if not os.path.isfile(cmd[0]):
|
| parser.error('Tracing failed for: %s\nIt doesn\'t exit' % ' '.join(cmd))
|
|
|