From 801a2c6519bfde718a9ce9b3bb762879465c537f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 22 Jun 2018 21:06:53 -0500 Subject: Avoid errors when tool submodules do not exist. Bring in change from develop to allow merging b2 & predef to master. --- status/Jamfile.v2 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'status') diff --git a/status/Jamfile.v2 b/status/Jamfile.v2 index bdaddce21d..e36f775362 100644 --- a/status/Jamfile.v2 +++ b/status/Jamfile.v2 @@ -1,5 +1,5 @@ # Copyright 2002. Dave Abrahams -# Copyright 2016. Rene Rivera +# Copyright 2016-2018. Rene Rivera # 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) @@ -197,7 +197,16 @@ run-tests libs : $(libs-to-test)/test ; # Tests from Jamfiles in tools/ # Please keep these in alphabetical order -local tools-to-test = bcp check_build quickbook ; +local tools-to-test = ; +for local tooldir in bcp check_build quickbook +{ + local jamfile = [ modules.peek project : JAMFILE ] ; + local jamfiles = [ path.glob [ path.join tools $(tooldir) test ] : $(jamfile) ] ; + if $(jamfiles) + { + tools-to-test += $(tooldir) ; + } +} run-tests tools : $(tools-to-test)/test ; -- cgit v1.2.1