From fa091550bfac3c63c8a6ac4630536902ace358be Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sat, 2 Feb 2002 14:06:13 +0000
Subject: [PATCH] Slightly more-sophisticated testing behavior

[SVN r12632]
---
 python.jam    | 5 ++++-
 v1/python.jam | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/python.jam b/python.jam
index ce83f38f6..e06c2de45 100644
--- a/python.jam
+++ b/python.jam
@@ -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 ;
diff --git a/v1/python.jam b/v1/python.jam
index ce83f38f6..e06c2de45 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -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 ;