diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-26 05:06:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 05:06:05 (GMT) |
| commit | 75e834700d19aa373b428c7c746f951737354c28 (patch) | |
| tree | 34a0bc4aefc5bf4ff22dcb4f462b302a9e89dc60 /appveyor.yml | |
| parent | 707b3b25c8f3da4f1648eed9689afe34065394c4 (diff) | |
| parent | c2a2f49a3d387e823ff728a9b671167352025860 (diff) | |
| download | googletest-75e834700d19aa373b428c7c746f951737354c28.zip googletest-75e834700d19aa373b428c7c746f951737354c28.tar.gz googletest-75e834700d19aa373b428c7c746f951737354c28.tar.bz2 | |
Merge pull request #1864 from google/revert-1853-appveyor-mingw-enable-tests-again
Revert "[mingw] enable the unittests for gmock and gtest again"
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3b72a11..5574466 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 = "-Dgtest_build_tests=ON" - $gmock_build_tests = "-Dgmock_build_tests=ON" + $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"} & cmake -G "$env:generator" $conf -Dgtest_build_samples=ON $gtest_build_tests $gmock_build_tests .. if ($LastExitCode -ne 0) { throw "Exec: $ErrorMessage" |