diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-09 11:00:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 11:00:35 -0500 |
| commit | c211f21906ca1b40bd10b46052cde85b291963f6 (patch) | |
| tree | 93570e0098d107f38417c6524b79c26dbda37120 /googletest/test | |
| parent | a3c73ed28d7995b18d48027aee740ad827fcc157 (diff) | |
| parent | ec7faa943d7817c81ce7bdf71a21ebc9244dc8de (diff) | |
| download | googletest-c211f21906ca1b40bd10b46052cde85b291963f6.tar.gz googletest-c211f21906ca1b40bd10b46052cde85b291963f6.tar.bz2 googletest-c211f21906ca1b40bd10b46052cde85b291963f6.zip | |
Merge pull request #1448 from gennadiycivil/master
merges
Diffstat (limited to 'googletest/test')
| -rwxr-xr-x | googletest/test/gtest_env_var_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_env_var_test.py b/googletest/test/gtest_env_var_test.py index 7af00cee..2fe9cd5f 100755 --- 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: |