From d12d2d9a3a8fdb1d0cf7c274df2d5121d7bbf459 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Sat, 19 Sep 2020 23:02:30 -0400
Subject: [PATCH] Updated .yml files

---
 .travis.yml  | 14 ++++++--------
 appveyor.yml |  7 +++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c371759..1303542 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,7 +118,7 @@ matrix:
 
     - os: linux
       compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=preprocessor_limits
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_limits
       addons:
         apt:
           packages:
@@ -138,7 +138,7 @@ matrix:
 
     - os: linux
       compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=preprocessor_limits
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_limits
       addons:
         apt:
           packages:
@@ -160,7 +160,7 @@ matrix:
     - os: linux
       dist: bionic
       compiler: g++-10
-      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits
+      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
       addons:
         apt:
           packages:
@@ -306,7 +306,7 @@ matrix:
 
     - os: linux
       compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits
+      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
       addons:
         apt:
           packages:
@@ -330,7 +330,7 @@ matrix:
 
     - os: linux
       compiler: clang++-10
-      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits
+      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
       addons:
         apt:
           packages:
@@ -394,9 +394,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - cd libs/preprocessor/test
-  - ../../../b2 -j 3 toolset=$TOOLSET cxxstd=$CXXSTD $PPLIMITS
-  - cd ../../..
+  - b2 libs/preprocessor/test$PPLIMITS -j 3 toolset=$TOOLSET cxxstd=$CXXSTD
 
 notifications:
   email:
diff --git a/appveyor.yml b/appveyor.yml
index 9f25056..f6592af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ branches:
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-10.0,msvc-11.0
+      TOOLSET: msvc-11.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-12.0
       ADDRMD: 32,64
@@ -84,9 +84,8 @@ for:
     - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
     - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
     - if not "%PREPROCESSOR%" == "" set PREPROCESSOR=cflags="%PREPROCESSOR%"
-    - cd libs/preprocessor/test
-    - ..\..\..\b2 -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release %PPLIMITS%
-    - cd ..\..\..
+    - if not "%PPLIMITS%" == "" set PPLIMITS=//%PPLIMITS%
+    - b2 libs/preprocessor/test%PPLIMITS% -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release
 
 -
   matrix: