diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-04-03 21:15:16 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-04-03 21:15:16 (GMT) |
| commit | 1f3b098ef3afb1d186778d47ccecf9d188ef49b2 (patch) | |
| tree | c21dcf94a8d23a214e8e0c520b54e2ca3815487e /googletest/CMakeLists.txt | |
| parent | c9e0aed90b5c90cf3f88413da1ef07d925f025e1 (diff) | |
| parent | 67c75ff8baf4228e857c09d3aaacd3f1ddf53a8f (diff) | |
| download | googletest-1f3b098ef3afb1d186778d47ccecf9d188ef49b2.zip googletest-1f3b098ef3afb1d186778d47ccecf9d188ef49b2.tar.gz googletest-1f3b098ef3afb1d186778d47ccecf9d188ef49b2.tar.bz2 | |
Merge pull request #2203 from ngie-eign:issue-2189
PiperOrigin-RevId: 241803437
Diffstat (limited to 'googletest/CMakeLists.txt')
| -rw-r--r-- | googletest/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 6e42c5c..c8a221d 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -222,6 +222,7 @@ $env:Path = \"$project_bin;$env:Path\" test/gtest-typed-test2_test.cc) cxx_test(gtest_unittest gtest_main) cxx_test(gtest-unittest-api_test gtest) + cxx_test(gtest_skip_in_environment_setup_test gtest_main) cxx_test(gtest_skip_test gtest_main) ############################################################ @@ -262,6 +263,8 @@ $env:Path = \"$project_bin;$env:Path\" cxx_executable(googletest-break-on-failure-unittest_ test gtest) py_test(googletest-break-on-failure-unittest) + py_test(gtest_skip_environment_check_output_test) + # Visual Studio .NET 2003 does not support STL with exceptions disabled. if (NOT MSVC OR MSVC_VERSION GREATER 1310) # 1310 is Visual Studio .NET 2003 cxx_executable_with_flags( |