Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1610
Modified Files:
testing.jam python.jam
Log Message:
Don't remove python scripts for Python tests.
Index: testing.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/testing.jam,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- testing.jam 17 Nov 2006 06:26:12 -0000 1.48
+++ testing.jam 18 Nov 2006 08:56:43 -0000 1.49
@@ -342,7 +342,14 @@
toolset.flags testing.capture-output ARGS <testing.arg> ;
toolset.flags testing.capture-output INPUT_FILES <testing.input-file> ;
toolset.flags testing.capture-output LAUNCHER <testing.launcher> ;
-rule capture-output ( target : source : properties * )
+
+# Runs executable 'sources' and stores stdout in file 'target'.
+# If --preserve-test-targets command line option, removes the executable.
+# The 'target-to-remove' parameter controls what should be removed:
+# - if 'none', does not remove anything, ever
+# - if empty, removes 'source'
+# - if non-empty and not 'none', contains a list of sources to remove.
+rule capture-output ( target : source : properties * : targets-to-remove ? )
{
output-file on $(target) = $(target:S=.output) ;
LOCATE on $(target:S=.output) = [ on $(target) return $(LOCATE) ] ;
@@ -358,13 +365,22 @@
# before target is created. Therefore, they are bound using SEARCH setting
# on them and not LOCATE setting of $(target), as in other case (due to
jam bug).
DEPENDS $(target) : [ on $(target) return $(INPUT_FILES) ] ;
-
+
+ if $(targets-to-remove) = none
+ {
+ targets-to-remove = ;
+ }
+ else if ! $(targets-to-remove)
+ {
+ targets-to-remove = $(source) ;
+ }
+
run-path-setup $(target) : $(source) : $(properties) ;
if ! $(preserve-test-targets)
{
- TEMPORARY $(source) ;
- RmTemps $(target) : $(source) ;
+ TEMPORARY $(targets-to-remove) ;
+ RmTemps $(target) : $(targets-to-remove) ;
}
}
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- python.jam 14 Oct 2006 10:45:31 -0000 1.46
+++ python.jam 18 Nov 2006 08:56:43 -0000 1.47
@@ -613,7 +613,10 @@
# over explicitly.
RUN_PATH on $(sources[1]) = [ on $(sources[2]) return $(RUN_PATH) ] ;
PYTHONPATH = [ on $(sources[2]) return $(LOCATE) ] ;
- testing.capture-output $(target) : $(sources[1]) : $(properties) ;
+ # After test is run, we remove the Python module, but not the Python
+ # script.
+ testing.capture-output $(target) : $(sources[1]) : $(properties)
+ : $(sources[2]) ;
local c = [ common.prepend-path-variable-command PYTHONPATH :
$(PYTHONPATH) ] ;
LAUNCHER on $(target) = $(c) [ on $(target) return $(PYTHON) ] ;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
