From 6c350c6fc3eff8f942faebb48f83cacd14ae1ce3 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sun, 5 Jan 2020 06:46:08 +0200
Subject: [PATCH] Update appveyor.yml

---
 appveyor.yml | 72 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b43326f..878a552 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,6 @@
 # Copyright 2017 Edward Diener
 # Copyright 2018 Mike Dev
+# Copyright 2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -8,13 +9,16 @@ version: 1.0.{build}-{branch}
 shallow_clone: true
 
 configuration:
-  - boost_test
-  - cmake_self_test
+  - boost_build_test
+  - cmake_test
+  - cmake_subdir_test
+  - cmake_install_test
 
 branches:
   only:
     - master
     - develop
+    - /feature\/.*/
 
 environment:
   matrix:
@@ -22,41 +26,61 @@ environment:
       TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0,msvc-14.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
 
 build: off
 
+install:
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/boostdep
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\preprocessor\
+  - python tools/boostdep/depinst/depinst.py preprocessor
+  - bootstrap
+  - b2 headers
+
 for:
 -
   matrix:
     only:
-      - configuration: cmake_self_test
+      - configuration: boost_build_test
 
   test_script:
-    - mkdir __build__
-    - cd __build__
-    - cmake ../test
-    - cmake --build .
+    - b2 -j3 libs/preprocessor/test toolset=%TOOLSET%
 
 -
   matrix:
     only:
-      - configuration: boost_test
-
-  install:
-    - cd ..
-    - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
-    - cd boost-root
-    - git submodule update --init tools/build
-    - git submodule update --init libs/config
-    - git submodule update --init tools/boostdep
-    - git submodule update --init tools/boost_install
-    - git submodule update --init libs/headers
-    - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\preprocessor
-    - python tools/boostdep/depinst/depinst.py preprocessor
-    - bootstrap
-    - b2 headers
+      - configuration: cmake_test
 
   test_script:
-    - b2 libs/preprocessor/test toolset=%TOOLSET%
-    - cd ../preprocessor/test
+    - mkdir __build__ && cd __build__
+    - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=preprocessor ..
+    - ctest --output-on-failure -R boost_preprocessor -C Debug
 
+-
+  matrix:
+    only:
+      - configuration: cmake_subdir_test
+
+  test_script:
+    - cd libs/preprocessor/test/cmake_subdir_test && mkdir __build__ && cd __build__
+    - cmake ..
+    - cmake --build .
+    - cmake --build . --target check
+
+-
+  matrix:
+    only:
+      - configuration: cmake_install_test
+
+  test_script:
+    - mkdir __build__ && cd __build__
+    - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=preprocessor -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+    - cmake --build . --target install
+    - cd ../libs/preprocessor/test/cmake_install_test && mkdir __build__ && cd __build__
+    - cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+    - cmake --build .
+    - cmake --build . --target check