[Boost-commit] svn:boost r46101 - trunk/tools/jam/test

From: jurko.gospodnetic_at_[hidden]
Date: 2008-06-03 19:12:32

Author: jurko
Date: 2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
New Revision: 46101
URL: http://svn.boost.org/trac/boost/changeset/46101

Log:
Made Boost Jam tests quote their bjam executable name when calling it allowing those executables to contain spaces in their name and/or path. This also causes one of the tests (action_status.jam) to fail on Windows due to a popen() command unquoting feature on that platform.
Text files modified: 
   trunk/tools/jam/test/action_status.jam              |     6 +++---                                  
   trunk/tools/jam/test/actions_quietly.jam            |     4 ++--                                    
   trunk/tools/jam/test/option_d2.jam                  |     2 +-                                      
   trunk/tools/jam/test/option_l.jam                   |     2 +-                                      
   trunk/tools/jam/test/option_n.jam                   |     2 +-                                      
   trunk/tools/jam/test/parallel_actions.jam           |     2 +-                                      
   trunk/tools/jam/test/parallel_multifile_actions.jam |     2 +-                                      
   7 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/tools/jam/test/action_status.jam
==============================================================================
--- trunk/tools/jam/test/action_status.jam	(original)
+++ trunk/tools/jam/test/action_status.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -6,12 +6,12 @@
 {
     ECHO --- Testing \"actions status results\"... ;
 
-    assert "" 0 : (==) : [ SHELL "$(ARGV[1]) -f action_status.jam -sBJAM_SUBTEST=1" : exit-status : no-output ] ;
+    assert "" 0 : (==) : [ SHELL "\"$(ARGV[1])\" -f action_status.jam -sBJAM_SUBTEST=1" : exit-status : no-output ] ;
     if $(NT)
     {
-        assert "" 0 : (==) : [ SHELL "$(ARGV[1]) -f action_status.jam -sBJAM_SUBTEST=1 \"-sACTION=;\"" : exit-status : no-output ] ;
+        assert "" 0 : (==) : [ SHELL "\"$(ARGV[1])\" -f action_status.jam -sBJAM_SUBTEST=1 \"-sACTION=;\"" : exit-status : no-output ] ;
     }
-    assert "" 0 : (!=) : [ SHELL "$(ARGV[1]) -f action_status.jam -sBJAM_SUBTEST=1 -sACTION=invalid" : exit-status : no-output ] ;
+    assert "" 0 : (!=) : [ SHELL "\"$(ARGV[1])\" -f action_status.jam -sBJAM_SUBTEST=1 -sACTION=invalid" : exit-status : no-output ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/actions_quietly.jam
==============================================================================
--- trunk/tools/jam/test/actions_quietly.jam	(original)
+++ trunk/tools/jam/test/actions_quietly.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -27,12 +27,12 @@
 [subtest_b] 1
 [subtest_b] 2
 ...updated 2 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f actions_quietly.jam -sBJAM_SUBTEST=1 -d2" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f actions_quietly.jam -sBJAM_SUBTEST=1 -d2" ] ;
 
     assert "...found 4 targets...
 ...updating 2 targets...
 ...updated 2 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f actions_quietly.jam -sBJAM_SUBTEST=1" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f actions_quietly.jam -sBJAM_SUBTEST=1" ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/option_d2.jam
==============================================================================
--- trunk/tools/jam/test/option_d2.jam	(original)
+++ trunk/tools/jam/test/option_d2.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -27,7 +27,7 @@
 [subtest_b] 1
 [subtest_b] 2
 ...updated 2 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f option_d2.jam -sBJAM_SUBTEST=1 -d2" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f option_d2.jam -sBJAM_SUBTEST=1 -d2" ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/option_l.jam
==============================================================================
--- trunk/tools/jam/test/option_l.jam	(original)
+++ trunk/tools/jam/test/option_l.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -18,7 +18,7 @@
 
 ...failed .a. sleeper...
 ...failed updating 1 target...
-" : (==) : [ SHELL "$(ARGV[1]) -f option_l.jam -sBJAM_SUBTEST=1 -l2" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f option_l.jam -sBJAM_SUBTEST=1 -l2" ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/option_n.jam
==============================================================================
--- trunk/tools/jam/test/option_n.jam	(original)
+++ trunk/tools/jam/test/option_n.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -21,7 +21,7 @@
 echo [subtest_b] 2
     
 ...updated 2 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f option_n.jam -sBJAM_SUBTEST=1 -n" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f option_n.jam -sBJAM_SUBTEST=1 -n" ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/parallel_actions.jam
==============================================================================
--- trunk/tools/jam/test/parallel_actions.jam	(original)
+++ trunk/tools/jam/test/parallel_actions.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -41,7 +41,7 @@
 [.b] 1
 [.b] 2
 ...updated 8 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f parallel_actions.jam -sBJAM_SUBTEST=1 -j4" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f parallel_actions.jam -sBJAM_SUBTEST=1 -j4" ] ;
 }
 else
 {

Modified: trunk/tools/jam/test/parallel_multifile_actions.jam
==============================================================================
--- trunk/tools/jam/test/parallel_multifile_actions.jam	(original)
+++ trunk/tools/jam/test/parallel_multifile_actions.jam	2008-06-03 19:12:31 EDT (Tue, 03 Jun 2008)
@@ -16,7 +16,7 @@
 .use.2 u2.user
 004
 ...updated 4 targets...
-" : (==) : [ SHELL "$(ARGV[1]) -f parallel_multifile_actions.jam -sBJAM_SUBTEST=1 -j2" ] ;
+" : (==) : [ SHELL "\"$(ARGV[1])\" -f parallel_multifile_actions.jam -sBJAM_SUBTEST=1 -j2" ] ;
 }
 else
 {