From bff73def85afca0273e9d24ef7df6b005996fa31 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Fri, 25 Sep 2020 12:47:54 -0400
Subject: [PATCH] Remove preprocessor limits CI testing

---
 .travis.yml  | 167 +--------------------------------------------------
 appveyor.yml |  45 +-------------
 2 files changed, 2 insertions(+), 210 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90d1d8d..390caf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,36 +116,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - os: linux
-      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_tup ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-8
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_512 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-8
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_1024 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-8
-          sources:
-            - ubuntu-toolchain-r-test
-
     - os: linux
       compiler: g++-9
       env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17
@@ -156,36 +126,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - os: linux
-      compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_tup ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-9
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_512 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-9
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_1024 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-9
-          sources:
-            - ubuntu-toolchain-r-test
-
     - os: linux
       dist: bionic
       compiler: g++-10
@@ -197,39 +137,6 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - os: linux
-      dist: bionic
-      compiler: g++-10
-      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_tup ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      dist: bionic
-      compiler: g++-10
-      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_512 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      dist: bionic
-      compiler: g++-10
-      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_1024 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - ubuntu-toolchain-r-test
-
     - os: linux
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
@@ -366,42 +273,6 @@ matrix:
             - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
               key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
-    - os: linux
-      compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_tup ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-9
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_512 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-9
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_1024 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-9
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
     - os: linux
       compiler: clang++-10
       env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a
@@ -414,42 +285,6 @@ matrix:
             - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
               key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
-    - os: linux
-      compiler: clang++-10
-      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_tup ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-10
-      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_512 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-10
-      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_1024 ADDRMD="address-model=64"
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
     - os: linux
       dist: trusty
       compiler: clang++-libc++
@@ -504,7 +339,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - ./b2 libs/preprocessor/test$PPLIMITS -j 3 toolset=$TOOLSET cxxstd=$CXXSTD $ADDRMD
+  - ./b2 libs/preprocessor/test -j 3 toolset=$TOOLSET cxxstd=$CXXSTD $ADDRMD
 
 notifications:
   email:
diff --git a/appveyor.yml b/appveyor.yml
index b045b67..3cf01fe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,48 +47,6 @@ environment:
       ADDRMD: 32,64
       CXXSTD: 14,17,latest
       PREPROCESSOR: /Zc:preprocessor
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: 14,17,latest
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_tup
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: 14
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_512
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: 17
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_512
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: latest
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_512
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: 14
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_1024
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: 17
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_1024
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 64
-      CXXSTD: latest
-      PREPROCESSOR: /Zc:preprocessor
-      PPLIMITS: preprocessor_1024
 
 matrix:
   exclude:
@@ -127,8 +85,7 @@ for:
     - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
     - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
     - if not "%PREPROCESSOR%" == "" set PREPROCESSOR=cflags="%PREPROCESSOR%"
-    - if not "%PPLIMITS%" == "" set PPLIMITS=//%PPLIMITS%
-    - b2 libs/preprocessor/test%PPLIMITS% -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release
+    - b2 libs/preprocessor/test -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release
 
 -
   matrix: