diff --git a/appveyor.yml b/appveyor.yml index c1f7960..806e060 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,9 +27,13 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - ARGS: toolset=gcc address-model=32 cxxstd=03,11,14,1z PATH: C:\cygwin\bin;%PATH% + # Cygwin does not have python headers installed, the compiler picks up Win32 headers in C:\Python27\Include and fails + BOOST_PARAMETER_TEST_WITHOUT_PYTHON_TESTS: 1 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - ARGS: toolset=gcc address-model=64 cxxstd=03,11,14,1z PATH: C:\cygwin64\bin;%PATH% + # Cygwin64 does not have python headers installed, the compiler picks up Win32 headers in C:\Python27\Include and fails + BOOST_PARAMETER_TEST_WITHOUT_PYTHON_TESTS: 1 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - ARGS: toolset=gcc address-model=32 cxxstd=03,11 linkflags=-Wl,-allow-multiple-definition PATH: C:\MinGW\bin;%PATH% diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d9ccdbf..eb5f7d1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,6 +6,7 @@ # Boost Parameter Library test Jamfile +import os ; import testing ; project boost/parameter @@ -492,68 +493,75 @@ alias parameter_literate_tests ] ; -alias parameter_python_test - : - : - # Python fails for clang on linux with cxxstd set to 14 - linux - clang - 14 - ; +if ! [ os.environ BOOST_PARAMETER_TEST_WITHOUT_PYTHON_TESTS ] +{ + alias parameter_python_test + : + : + # Python fails for clang on linux with cxxstd set to 14 + linux + clang + 14 + ; -alias parameter_python_test - : - : - # Python fails for clang on linux with cxxstd set to 1z - linux - clang - 1z - ; + alias parameter_python_test + : + : + # Python fails for clang on linux with cxxstd set to 1z + linux + clang + 1z + ; -alias parameter_python_test - : - : - # Python fails for xcode 8.3.0 on osx - # so we turn off this test for this compiler completely for now - darwin - # TODO: Differentiate by xcode version or by clang version - ; + alias parameter_python_test + : + : + # Python fails for xcode 8.3.0 on osx + # so we turn off this test for this compiler completely for now + darwin + # TODO: Differentiate by xcode version or by clang version + ; -alias parameter_python_test - : - : - # Python fails for mingw compilers with cxxstd set to 11 or higher - # because of a Python header problem - # so we turn off this test for this compiler completely - windows - gcc - 32 - ; + alias parameter_python_test + : + : + # Python fails for mingw compilers with cxxstd set to 11 or higher + # because of a Python header problem + # so we turn off this test for this compiler completely + windows + gcc + 32 + ; -alias parameter_python_test - : - : - # Python fails for clang-linux compilers with cxxstd set to 11 or higher - # because of a Python header problem - # so we turn off this test for this compiler completely - windows - clang-linux - 32 - ; + alias parameter_python_test + : + : + # Python fails for clang-linux compilers with cxxstd set to 11 or higher + # because of a Python header problem + # so we turn off this test for this compiler completely + windows + clang-linux + 32 + ; -alias parameter_python_test - : - : - # Python fails for windows compilers with 64-bit addressing set - # because of a Python header problem - windows - 64 - ; + alias parameter_python_test + : + : + # Python fails for windows compilers with 64-bit addressing set + # because of a Python header problem + windows + 64 + ; -alias parameter_python_test - : - [ bpl-test python_test ] - ; + alias parameter_python_test + : + [ bpl-test python_test ] + ; +} +else +{ + alias parameter_python_test ; +} alias parameter_macros_eval_category :