From d8e6f406abc1bdb52b02e3bffaae9af7d1c4a7fa Mon Sep 17 00:00:00 2001
From: Kohei Takahashi <flast@flast.jp>
Date: Mon, 29 Jan 2018 10:15:39 +0900
Subject: [PATCH] Mark as CI in Jamfile not command line

super-project also runs regression test, but they doesn't define that.
---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 test/Jamfile | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7ba31114..960235c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -201,4 +201,4 @@ install:
   - ./b2 headers
 
 script:
-  - ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD define=RUNNING_ON_TRAVIS=1
+  - ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD
diff --git a/appveyor.yml b/appveyor.yml
index d671946a..300faa15 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -71,4 +71,4 @@ install:
 build: off
 
 test_script:
-  - b2 -j%NUMBER_OF_PROCESSORS% libs/fusion/test toolset=%TOOLSET% define=RUNNING_ON_APPVEYOR=1
+  - b2 -j%NUMBER_OF_PROCESSORS% libs/fusion/test toolset=%TOOLSET%
diff --git a/test/Jamfile b/test/Jamfile
index c9b87da4..c02bb414 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -9,10 +9,19 @@
 #==============================================================================
 # bring in rules for testing
 import testing ;
+import os ;
 import ../../config/checks/config : requires ;
 
+if [ os.environ CI ]
+{
+    CI_DEFINES = <define>CI_SKIP_KNOWN_FAILURE=1 ;
+    CI_DEFINES += <define>RUNNING_ON_TRAVIS=1 ;   # for backward compatibility
+    CI_DEFINES += <define>RUNNING_ON_APPVEYOR=1 ; # for backward compatibility
+}
+
 project
     : requirements
+        $(CI_DEFINES)
     ;
 
 {