diff options
| author | dmauro <dmauro@google.com> | 2020-11-11 17:52:39 (GMT) |
|---|---|---|
| committer | Mark Barolak <mbar@google.com> | 2020-11-12 18:32:03 (GMT) |
| commit | 336fd36fee0e95a28a6f5f8ea77e36a2eb7c583e (patch) | |
| tree | db62773c4bfb562bd100f300c49306e88cc9940e /googlemock | |
| parent | b4999a1e2ba8afad6f76e7bb2d16c9abaeb9411e (diff) | |
| download | googletest-336fd36fee0e95a28a6f5f8ea77e36a2eb7c583e.zip googletest-336fd36fee0e95a28a6f5f8ea77e36a2eb7c583e.tar.gz googletest-336fd36fee0e95a28a6f5f8ea77e36a2eb7c583e.tar.bz2 | |
Googletest export
Rollback change from
https://github.com/google/googletest/pull/1836. This change generates
a script on Windows to actually run each test, but the script itself
doesn't correctly report if the test passed.
This change will "break tests" that were already broken on Windows,
but weren't being reported as such.
PiperOrigin-RevId: 341850671
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 1887942..1fc11e7 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -138,20 +138,6 @@ if (gmock_build_tests) # 'make test' or ctest. enable_testing() - if (WIN32) - file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/RunTest.ps1" - CONTENT -"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\" -$env:Path = \"$project_bin;$env:Path\" -& $args") - elseif (MINGW OR CYGWIN) - file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1" - CONTENT -"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin) -$env:Path = \"$project_bin;$env:Path\" -& $args") - endif() - if (MINGW OR CYGWIN) if (CMAKE_VERSION VERSION_LESS "2.8.12") add_compile_options("-Wa,-mbig-obj") |