From 0f3365c576ea3bf013a8e6a5b42c88432728e678 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 10 Dec 2018 19:31:42 +0000 Subject: [PATCH] test_roots.cpp: Fix macro usage (again), also split up CI tests a bit more to handle timeouts. --- appveyor.yml | 10 ++++++++-- test/test_roots.cpp | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6f9be96d1..9dded41c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,7 +41,9 @@ environment: - ARGS: --toolset=msvc-12.0 address-model=64 TEST_SUITE: misc ../example//examples - ARGS: --toolset=msvc-14.0 address-model=64 - TEST_SUITE: special_fun distribution_tests + TEST_SUITE: special_fun + - ARGS: --toolset=msvc-14.0 address-model=64 + TEST_SUITE: distribution_tests - ARGS: --toolset=msvc-14.0 address-model=64 TEST_SUITE: misc ../example//examples @@ -55,7 +57,11 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARGS: --toolset=msvc-14.1 address-model=32 - TEST_SUITE: special_fun distribution_tests + TEST_SUITE: special_fun + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ARGS: --toolset=msvc-14.1 address-model=32 + TEST_SUITE: distribution_tests - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARGS: --toolset=msvc-14.1 address-model=32 diff --git a/test/test_roots.cpp b/test/test_roots.cpp index 3d5e24a17..307339730 100644 --- a/test/test_roots.cpp +++ b/test/test_roots.cpp @@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE( test_main ) test_beta(0.1, "double"); -#ifndef BOOST_NO_CXX11_AUTO_DECLARATIONS +#if !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) && !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) && !defined(BOOST_NO_CXX11_LAMBDAS) test_complex_newton>(); test_complex_newton>(); test_complex_newton();