From bd19ed1a87bf9f3b394647aaa02ded8a1cbb135e Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Tue, 23 Jan 2018 10:40:56 +0300 Subject: [PATCH] Disable link-fail tests and restore MinGW CI --- test/Jamfile.v2 | 9 ++++++--- test/appveyor.yml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 421a71d..fc5c92a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -54,9 +54,12 @@ test-suite type_index [ compile type_index_test_ctti_alignment.cpp ] # Mixing RTTI on and off - [ link-fail testing_crossmodule.cpp test_lib_rtti : $(nortti) : link_fail_nortti_rtti ] - # MSVC sometimes overrides the /GR-, without `detect_missmatch` this test may link - [ link-fail testing_crossmodule.cpp test_lib_nortti : : link_fail_rtti_nortti ] + + # MSVC sometimes overrides the /GR-, without `detect_missmatch` this test may link. + # TODO: Disabled on MSVC. Enable again when there'll be an understanding of how to write this test correctly wor MSVC. + [ link-fail testing_crossmodule.cpp test_lib_rtti : $(nortti) msvc:no : link_fail_nortti_rtti ] + [ link-fail testing_crossmodule.cpp test_lib_nortti : msvc:no : link_fail_rtti_nortti ] + [ run testing_crossmodule.cpp test_lib_rtti_compat : : : $(nortti) $(compat) : testing_crossmodule_nortti_rtti_compat ] [ run testing_crossmodule.cpp test_lib_nortti_compat : : : $(compat) : testing_crossmodule_rtti_nortti_compat ] ; diff --git a/test/appveyor.yml b/test/appveyor.yml index 8f2e026..3f54925 100644 --- a/test/appveyor.yml +++ b/test/appveyor.yml @@ -2,7 +2,7 @@ # subject to the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Copyright Antony Polukhin 2016-2017. +# Copyright Antony Polukhin 2016-2018. # # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file @@ -56,7 +56,7 @@ build_script: after_build: before_test: test_script: - - ..\..\..\b2.exe address-model=32 architecture=x86 toolset=msvc cxxflags="-DBOOST_TRAVISCI_BUILD" -sBOOST_BUILD_PATH=. + - ..\..\..\b2.exe address-model=32 architecture=x86 toolset=msvc,gcc cxxflags="-DBOOST_TRAVISCI_BUILD" -sBOOST_BUILD_PATH=. after_test: on_success: