diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 21:44:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 21:44:13 -0700 |
| commit | a6b5c58ec8e39589549ff155693f29b748988908 (patch) | |
| tree | b538b286f4c002955bc53847c5fb1a04540346b9 | |
| parent | 0809c68040ab11b906568e8df72019ce2fe0b049 (diff) | |
| parent | 9241466921b7bd6ae4915923a5d7af55446abfd1 (diff) | |
| download | googletest-a6b5c58ec8e39589549ff155693f29b748988908.tar.gz googletest-a6b5c58ec8e39589549ff155693f29b748988908.tar.bz2 googletest-a6b5c58ec8e39589549ff155693f29b748988908.zip | |
Merge pull request #1853 from matlo607/appveyor-mingw-enable-tests-again
[mingw] enable the unittests for gmock and gtest again
| -rw-r--r-- | appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 55744664..3b72a117 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,8 +64,8 @@ build_script: $conf = if ($env:generator -eq "MinGW Makefiles") {"-DCMAKE_BUILD_TYPE=$env:configuration"} else {"-DCMAKE_CONFIGURATION_TYPES=Debug;Release"} # Disable test for MinGW (gtest tests fail, gmock tests can not build) - $gtest_build_tests = if ($env:generator -eq "MinGW Makefiles") {"-Dgtest_build_tests=OFF"} else {"-Dgtest_build_tests=ON"} - $gmock_build_tests = if ($env:generator -eq "MinGW Makefiles") {"-Dgmock_build_tests=OFF"} else {"-Dgmock_build_tests=ON"} + $gtest_build_tests = "-Dgtest_build_tests=ON" + $gmock_build_tests = "-Dgmock_build_tests=ON" & cmake -G "$env:generator" $conf -Dgtest_build_samples=ON $gtest_build_tests $gmock_build_tests .. if ($LastExitCode -ne 0) { throw "Exec: $ErrorMessage" |