merges

2018-02-09 10:41:09 -05:00
parent a3c73ed28d
commit ec7faa943d
5 changed files with 33 additions and 23 deletions
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
@@ -92,7 +92,7 @@ class GTestEnvVarTest(gtest_test_utils.TestCase):
    TestFlag('print_time', '0', '1')
    TestFlag('repeat', '999', '1')
    TestFlag('throw_on_failure', '1', '0')
-    TestFlag('death_test_style', 'threadsafe', 'fast')
+    TestFlag('death_test_style', 'fast', 'threadsafe')
    TestFlag('catch_exceptions', '0', '1')

    if IS_LINUX: