diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-06 00:47:20 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-06 00:47:20 +0000 |
| commit | 37504994338c114247519331237831f88a9a7c40 (patch) | |
| tree | a7c84a0c95dd0bb3af5e23cd4cce7dba4c4bc8f2 /test/gtest_output_test.py | |
| parent | ad99ca14461f0e929d835d29518e11c05e8d41f0 (diff) | |
| download | googletest-37504994338c114247519331237831f88a9a7c40.tar.gz googletest-37504994338c114247519331237831f88a9a7c40.tar.bz2 googletest-37504994338c114247519331237831f88a9a7c40.zip | |
Adds tests for EXPECT_FATAL_FAILURE and reduces the golden file bloat (by Zhanyong Wan). Fixes more warnings on Windows (by Vlad Losev).
Diffstat (limited to 'test/gtest_output_test.py')
| -rwxr-xr-x | test/gtest_output_test.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py index 42cf00c4..9aaade2e 100755 --- a/test/gtest_output_test.py +++ b/test/gtest_output_test.py @@ -61,11 +61,16 @@ else: GOLDEN_NAME = 'gtest_output_test_golden_lin.txt' PROGRAM_PATH = os.path.join(gtest_test_utils.GetBuildDir(), PROGRAM) + +# At least one command we exercise must not have the +# --gtest_internal_skip_environment_and_ad_hoc_tests flag. COMMAND_WITH_COLOR = PROGRAM_PATH + ' --gtest_color=yes' COMMAND_WITH_TIME = (PROGRAM_PATH + ' --gtest_print_time ' - + '--gtest_filter="FatalFailureTest.*:LoggingTest.*"') + '--gtest_internal_skip_environment_and_ad_hoc_tests ' + '--gtest_filter="FatalFailureTest.*:LoggingTest.*"') COMMAND_WITH_DISABLED = (PROGRAM_PATH + ' --gtest_also_run_disabled_tests ' - + '--gtest_filter="*DISABLED_*"') + '--gtest_internal_skip_environment_and_ad_hoc_tests ' + '--gtest_filter="*DISABLED_*"') GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME) |