Merge pull request #1853 from matlo607/appveyor-mingw-enable-tests-again

[mingw] enable the unittests for gmock and gtest again

Merge pull request #1853 from matlo607/appveyor-mingw-enable-tests-again
[mingw] enable the unittests for gmock and gtest again
a6b5c58e · Gennadiy Civil · GitHub · 0809c680 · 92414669 · a6b5c58e
Unverified Commit a6b5c58e authored Sep 25, 2018 by Gennadiy Civil Committed by GitHub Sep 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

appveyor.yml appveyor.yml +2 -2

No files found.
--- 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"