From 37acf89aadd5e96196ce8d7d24b59829db5b1fa0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 28 Jan 2015 16:11:26 -0600 Subject: [PATCH] Fix for some test programs that require some form of input stream by providing a null one for them to open instead of the non-existent pipes. --- src/tools/testing.jam | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/testing.jam b/src/tools/testing.jam index 969e95bef..adb3d3e7e 100644 --- a/src/tools/testing.jam +++ b/src/tools/testing.jam @@ -1,6 +1,6 @@ # Copyright 2005 Dave Abrahams # Copyright 2002, 2003, 2004, 2005, 2006 Vladimir Prus -# Copyright 2014 Rene Rivera +# Copyright 2014-2015 Rene Rivera # Copyright 2014 Microsoft Corporation # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) @@ -537,6 +537,7 @@ if [ os.name ] = NT .SHELL_SET = "set " ; .CATENATE = type ; .CP = copy ; + .NULLIN = ; } else { @@ -550,6 +551,7 @@ else .SHELL_SET = "" ; .CATENATE = cat ; .CP = cp ; + .NULLIN = "<" "/dev/null" ; } @@ -571,7 +573,7 @@ actions capture-output bind INPUT_FILES output-file echo Skipping test execution due to testing.execute=off exit 0 $(.ENDIF) - $(LAUNCHER) "$(>)" $(ARGS) "$(INPUT_FILES)" > "$(output-file)" 2>&1 + $(LAUNCHER) "$(>)" $(ARGS) "$(INPUT_FILES)" > "$(output-file)" 2>&1 $(.NULLIN) $(.SET_STATUS) $(.RUN_OUTPUT_NL) >> "$(output-file)" echo EXIT STATUS: $(.STATUS) >> "$(output-file)"