From 92ac085edf6c70b4dd24f2706d19e96c152e3d86 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Fri, 28 Aug 2020 01:00:37 -0400
Subject: [PATCH] Updated for new VC++ preprocessor, explicit tests, address
 model, and cxxstd.

---
 appveyor.yml | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9c97adf..3fdcfe2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,11 +23,33 @@ branches:
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0,msvc-14.0
+      TOOLSET: msvc-10.0,msvc-11.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-14.0
+      ADDRMD: 32,64
+      CXXSTD: 14,17
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
+      ADDRMD: 32,64
+      CXXSTD: 14,17,latest
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       TOOLSET: msvc-14.2
+      ADDRMD: 32,64
+      CXXSTD: 14,17,latest
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      ADDRMD: 32,64
+      CXXSTD: 14,17,latest
+      PREPROCESSOR: "/Zc:preprocessor"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      ADDRMD: 32,64
+      CXXSTD: 14,17,latest
+      PREPROCESSOR: "/Zc:preprocessor"
+      LIMITS: preprocessor_limits
 
 matrix:
   exclude:
@@ -35,6 +57,8 @@ matrix:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - configuration: cmake_test
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - configuration: cmake_test
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 build: off
 
@@ -57,7 +81,10 @@ for:
   test_script:
     - bootstrap
     - b2 -d0 headers
-    - b2 -j3 libs/preprocessor/test toolset=%TOOLSET%
+    - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
+    - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+    - if not "%PREPROCESSOR%" == "" set PREPROCESSOR=cflags=%PREPROCESSOR%
+    - b2 -j3 libs/preprocessor/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release %LIMITS%
 
 -
   matrix: