Install and test with VC2019

Author: polytypic

commands/setup

@@ -11,6 +11,7 @@ Usage: [option=value ...] $CMD
 Options:
 
   CMAKE_BUILD_TYPE=Debug|Release
+  CMAKE_GENERATOR=|...
 
   CTEST_OUTPUT_ON_FAILURE=1|0
 
@@ -57,8 +58,13 @@ if ! cmake-help-contains "Visual Studio" || [ -n "$CXX" ]; then
   BUILD_DIR="$BUILD_DIR.$CMAKE_BUILD_TYPE${CXX:+.}$CXX"
   GENERATE_CMD+=("-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE")
 
-  if cmake-help-contains "MSYS Makefiles"; then
-    GENERATE_CMD+=("-G" "MSYS Makefiles")
+  if cmake-help-contains "MSYS Makefiles" && [ -z "$CMAKE_GENERATOR" ] ; then
+    CMAKE_GENERATOR="MSYS Makefiles"
+  fi
+fi
+if [ -n "$CMAKE_GENERATOR" ]; then
+  BUILD_DIR="$BUILD_DIR.${CMAKE_GENERATOR// /_}"
+  if [ "$CMAKE_GENERATOR" = "MSYS Makefiles" ]; then
     export CMAKE_MAKE_PROGRAM="make"
   fi
 fi

travis-ci

@@ -10,7 +10,6 @@ elif [ "$TRAVIS_OS_NAME" = osx ]; then
 fi
 
 LOCK="${TMP}install.lock"
-OUT="${TMP}install.out"
 
 if [ "$TRAVIS_OS_NAME" = linux ]; then
   locked() { flock "$LOCK" "$@"; }
@@ -27,23 +26,28 @@ elif [ "$TRAVIS_OS_NAME" = windows ]; then
 fi
 
 finish() {
-  local EXIT=0
-  if ! wait "${!1}"; then
-    EXIT=$?
-    cat "$OUT"
+  if [ -f "$TMP.$1" ]; then
+    tail -n 1000 -f "$TMP.$1" &
+    local PID=$!
+    wait "${!1}"
+    kill -9 $PID
+    rm -f "$TMP.$1"
   fi
-  return $EXIT
 }
 
 concurrently() {
   local VAR="$1"
   shift
-  "$@" >> "$OUT" 2>&1 &
+  "$@" >> "$TMP.$VAR" 2>&1 &
   local PID=$!
   export "$VAR"=$PID
   if [ "$INSTALL_WAIT" = 1 ]; then finish "$VAR"; fi
 }
 
+ignore() {
+  "$@" || true
+}
+
 folded() {
   FOLD=$((FOLD+1))
   echo -e "travis_fold:start:cppsm.$FOLD\033[33;1m$1\033[0m"
@@ -64,7 +68,8 @@ elif [ "$TRAVIS_OS_NAME" = osx ]; then
   [ "$CODECOV" != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
   [ "$FORMAT_CHECK" = 0 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
 elif [ "$TRAVIS_OS_NAME" = windows ]; then
-  folded ... concurrently MAKE_INSTALL_PID locked choco install make
+  folded ... concurrently MAKE_INSTALL_PID choco install make
+  folded ... concurrently VC2019_INSTALL_PID ignore choco install visualstudio2019-workload-vctools
 fi
 
 export CMAKE_HELP
@@ -84,7 +89,7 @@ for CONFIG in Debug Release; do
     folded ... finish GCC_INSTALL_PID
     CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
   elif [ "$TRAVIS_OS_NAME" = windows ]; then
-    CC='' CXX='' folded "VC $CONFIG" cppsm test
+    CC='' CXX='' folded "VC2017 $CONFIG" cppsm test
     folded ... finish MAKE_INSTALL_PID
     CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
   elif [ "$TRAVIS_OS_NAME" = osx ]; then
@@ -96,6 +101,16 @@ for CONFIG in Debug Release; do
   fi
 done
 
+if [ "$TRAVIS_OS_NAME" = windows ]; then
+  folded ... finish VC2019_INSTALL_PID
+  folded ... choco upgrade -y cmake.install
+
+  for CONFIG in Debug Release; do
+    export CMAKE_BUILD_TYPE=$CONFIG
+    CC='' CXX='' CMAKE_GENERATOR="Visual Studio 16 2019" folded "VC2019 $CONFIG" cppsm test
+  done
+fi
+
 code-coverage() {
   COVERAGE=1 cppsm test
   local COVERAGE_INFO="${TMP}coverage.info"
@@ -120,6 +135,3 @@ if [ "$TRAVIS_OS_NAME" = osx ]; then
   [ "$FORMAT_CHECK" = 0 ] || folded ... finish FORMAT_INSTALL_PID
   [ "$FORMAT_CHECK" = 0 ] || folded 'Format check' format-check
 fi
-
-install-output() { cat "$OUT"; }
-folded ... install-output