Removes uses of GTEST_HAS_STD_STRING.

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.