2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00

better behavior for --debugger=... option.

[SVN r24190]
This commit is contained in:
Dave Abrahams
2004-07-30 16:10:30 +00:00
parent 393c4f75e8
commit b30b584718

View File

@@ -414,7 +414,7 @@ rule run-test ( type-to-test run-target : sources * )
ENDIF on $(run-target) = "fi" ;
}
capture-run-output $(run-target) : $(executable) ;
capture-run-output $(run-target) : $(executable) : $(debugger) ;
if ! ( --preserve-test-targets in $(ARGV) )
{
@@ -423,14 +423,21 @@ rule run-test ( type-to-test run-target : sources * )
}
# The rule is just used for argument checking
rule capture-run-output ( target : executable + )
rule capture-run-output ( target : executable + : debugger ? )
{
gTEST_OUTPUT_FILE($(target)) = $(target:S=.output) ;
INCLUDES $(target) : $(target:S=.output) ;
MakeLocate $(test-file:S=.output) : $(LOCATE_TARGET) ;
Clean clean : $(test-file:S=.output) ;
output-file on $(target) = $(target:S=.output) ;
execute-test $(target) : $(executable) ;
if $(debugger)
{
debug-test $(target) : $(executable) ;
}
else
{
execute-test $(target) : $(executable) ;
}
if --run-all-tests in $(ARGV)
{
@@ -447,6 +454,11 @@ else
CATENATE = cat ;
}
actions debug-test bind INPUT_FILES
{
$(PATH_SETUP)$(>) $(ARGS) "$(INPUT_FILES)"
}
actions execute-test bind INPUT_FILES output-file
{
$(PATH_SETUP)$(>) $(ARGS) "$(INPUT_FILES)" > $(output-file) 2>&1