From d5bd40e5280487fb29a108eb42e6c4f0bef690d8 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sat, 16 Oct 2021 18:10:13 +0300
Subject: [PATCH] Update test/Jamfile and test/CMakeLists.txt so that missing
 dependencies are caught

---
 test/CMakeLists.txt | 19 +++++++++++++++++--
 test/Jamfile.v2     | 18 +++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 82f1b33..4f85621 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2018, 2019 Peter Dimov
+# Copyright 2018, 2019, 2021 Peter Dimov
 # Distributed under 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
 
@@ -6,7 +6,22 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
 
 if(HAVE_BOOST_TEST)
 
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core Boost::static_assert Boost::type_traits Boost::throw_exception)
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core Boost::static_assert)
+
+set(BOOST_TEST_LINK_LIBRARIES Boost::core Boost::type_traits)
+
+boost_test(TYPE run SOURCES eif_constructors.cpp)
+boost_test(TYPE run SOURCES eif_dummy_arg_disambiguation.cpp)
+boost_test(TYPE run SOURCES eif_lazy.cpp)
+boost_test(TYPE run SOURCES eif_lazy_test.cpp)
+boost_test(TYPE run SOURCES eif_member_templates.cpp)
+boost_test(TYPE run SOURCES eif_namespace_disambiguation.cpp)
+boost_test(TYPE run SOURCES eif_no_disambiguation.cpp)
+boost_test(TYPE run SOURCES eif_partial_specializations.cpp)
+
+set(BOOST_TEST_LINK_LIBRARIES Boost::core Boost::throw_exception)
+
+boost_test(TYPE run SOURCES no_exceptions_support_test.cpp)
 
 endif()
 
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 6ebefb6..f645a07 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -41,14 +41,14 @@ compile-fail ref_implicit_fail4.cpp ;
 run ref_cv_test.cpp ;
 run ref_conversion_test.cpp ;
 
-run eif_constructors.cpp ;
-run eif_dummy_arg_disambiguation.cpp ;
-run eif_lazy.cpp ;
-run eif_lazy_test.cpp ;
-run eif_member_templates.cpp ;
-run eif_namespace_disambiguation.cpp ;
-run eif_no_disambiguation.cpp ;
-run eif_partial_specializations.cpp ;
+run eif_constructors.cpp : ;
+run eif_dummy_arg_disambiguation.cpp : ;
+run eif_lazy.cpp : ;
+run eif_lazy_test.cpp : ;
+run eif_member_templates.cpp : ;
+run eif_namespace_disambiguation.cpp : ;
+run eif_no_disambiguation.cpp : ;
+run eif_partial_specializations.cpp : ;
 
 compile-fail noncopyable_compile_fail.cpp ;
 
@@ -229,7 +229,7 @@ run uncaught_exceptions.cpp
 run uncaught_exceptions_np.cpp
   : : : <exception-handling>on ;
 
-run no_exceptions_support_test.cpp ;
+run no_exceptions_support_test.cpp : ;
 run no_exceptions_support_test.cpp : : : <exception-handling>off : no_exceptions_support_test_nx ;
 
 run cmath_test.cpp ;