mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
Slightly more-sophisticated testing behavior
[SVN r12632]
This commit is contained in:
@@ -5,10 +5,12 @@ gPYTHON_INCLUDED = true ;
|
||||
# Do some OS-specific setup
|
||||
if $(NT)
|
||||
{
|
||||
CATENATE = type ;
|
||||
PYTHON_VERSION ?= 2.1 ;
|
||||
}
|
||||
else if $(UNIX)
|
||||
{
|
||||
CATENATE = cat ;
|
||||
PYTHON_VERSION ?= 1.5 ;
|
||||
}
|
||||
|
||||
@@ -285,6 +287,7 @@ rule python-test-target ( test-target : sources + )
|
||||
Clean clean : $(test-target) ; # remove the test-target as part of any clean operation
|
||||
type-DEPENDS test : $(test-target) ;
|
||||
MakeLocate $(test-target) : $(LOCATE_TARGET) ;
|
||||
MakeLocate $(test-target) : $(LOCATE_TARGET) ;
|
||||
}
|
||||
actions python-test-target bind PYTHON
|
||||
{
|
||||
@@ -294,7 +297,7 @@ actions python-test-target bind PYTHON
|
||||
$(SHELL_EXPORT)LD_LIBRARY_PATH
|
||||
$(SHELL_SET)PYTHONPATH=$(PYTHONPATH)
|
||||
$(SHELL_EXPORT)PYTHONPATH
|
||||
$(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS) > "$(<)"
|
||||
$(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS) 2>&1 "$(<)" || $(CATENATE) "$(<)"
|
||||
}
|
||||
|
||||
SUFPYTHON_RUNTEST = .run ;
|
||||
|
||||
Reference in New Issue
Block a user