diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 23:34:59 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 23:34:59 +0000 |
commit | 88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384 (patch) | |
tree | 2ccb8a80d9d1ee12db0de85b03dc9e9ed957b25a /run_tests.py | |
parent | 075b76bb96f1b6eac7dde41b47de0dd456b0f473 (diff) | |
download | googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.gz googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.bz2 googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.zip |
Removes uses of GTEST_HAS_STD_STRING.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-x | run_tests.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py index e1084056..aa2313e1 100755 --- a/run_tests.py +++ b/run_tests.py @@ -39,6 +39,12 @@ import sys SCRIPT_DIR = os.path.dirname(__file__) or '.' +# Some Python tests don't work in all configurations. +PYTHON_TESTS_TO_SKIP = ( + ('win-dbg', 'gtest_throw_on_failure_test.py'), + ('win-opt', 'gtest_throw_on_failure_test.py'), + ) + sys.path.append(os.path.join(SCRIPT_DIR, 'test')) import run_tests_util @@ -50,7 +56,8 @@ def _Main(): test_runner = run_tests_util.TestRunner(script_dir=SCRIPT_DIR) tests = test_runner.GetTestsToRun(args, options.configurations, - options.built_configurations) + options.built_configurations, + python_tests_to_skip=PYTHON_TESTS_TO_SKIP) if not tests: sys.exit(1) # Incorrect parameters given, abort execution. |