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

From: grafikrobot_at_[hidden]
Date: 2007-08-10 20:42:36

Author: grafik
Date: 2007-08-10 20:42:32 EDT (Fri, 10 Aug 2007)
New Revision: 38588
URL: http://svn.boost.org/trac/boost/changeset/38588

Log:
Minor adjustment to -n test, and add corresponding -d2 test.
Added:
   trunk/tools/jam/test/option_d2.jam   (contents, props changed)
Text files modified: 
   trunk/tools/jam/test/option_n.jam |    12 ++++++------                            
   trunk/tools/jam/test/test.jam     |     1 +                                       
   2 files changed, 7 insertions(+), 6 deletions(-)

Added: trunk/tools/jam/test/option_d2.jam
==============================================================================
--- (empty file)
+++ trunk/tools/jam/test/option_d2.jam	2007-08-10 20:42:32 EDT (Fri, 10 Aug 2007)
@@ -0,0 +1,50 @@
+#~ Copyright 2007 Rene Rivera.
+#~ Distributed under the Boost Software License, Version 1.0.
+#~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+
+if ! $(BJAM_SUBTEST)
+{
+    ECHO --- Testing -d2 option... ;
+
+    assert "...found 4 targets...
+...updating 2 targets...
+.a. subtest_a
+
+echo [subtest_a] 0
+echo [subtest_a] 1
+echo [subtest_a] 2
+    
+[subtest_a] 0
+[subtest_a] 1
+[subtest_a] 2
+.a. subtest_b
+
+echo [subtest_b] 0
+echo [subtest_b] 1
+echo [subtest_b] 2
+    
+[subtest_b] 0
+[subtest_b] 1
+[subtest_b] 2
+...updated 2 targets...
+" : (==) : [ SHELL "$(ARGV[1]) -f option_n.jam -sBJAM_SUBTEST=1 -d2" ] ;
+}
+else
+{
+    actions .a.
+    {
+echo [$(<:B)] 0
+echo [$(<:B)] 1
+echo [$(<:B)] 2
+    }
+    
+    rule .a.
+    {
+        DEPENDS $(<) : $(>) ;
+    }
+    
+    NOTFILE subtest ;
+    .a. subtest_a : subtest ;
+    .a. subtest_b : subtest ;
+    DEPENDS all : subtest_a subtest_b ;
+}

Modified: trunk/tools/jam/test/option_n.jam
==============================================================================
--- trunk/tools/jam/test/option_n.jam	(original)
+++ trunk/tools/jam/test/option_n.jam	2007-08-10 20:42:32 EDT (Fri, 10 Aug 2007)
@@ -8,13 +8,13 @@
 
     assert "...found 4 targets...
 ...updating 2 targets...
-n subtest_a
+.a. subtest_a
 
 echo [subtest_a] 0
 echo [subtest_a] 1
 echo [subtest_a] 2
     
-n subtest_b
+.a. subtest_b
 
 echo [subtest_b] 0
 echo [subtest_b] 1
@@ -25,20 +25,20 @@
 }
 else
 {
-    actions n
+    actions .a.
     {
 echo [$(<:B)] 0
 echo [$(<:B)] 1
 echo [$(<:B)] 2
     }
     
-    rule n
+    rule .a.
     {
         DEPENDS $(<) : $(>) ;
     }
     
     NOTFILE subtest ;
-    n subtest_a : subtest ;
-    n subtest_b : subtest ;
+    .a. subtest_a : subtest ;
+    .a. subtest_b : subtest ;
     DEPENDS all : subtest_a subtest_b ;
 }

Modified: trunk/tools/jam/test/test.jam
==============================================================================
--- trunk/tools/jam/test/test.jam	(original)
+++ trunk/tools/jam/test/test.jam	2007-08-10 20:42:32 EDT (Fri, 10 Aug 2007)
@@ -43,6 +43,7 @@
 
 include builtin_shell.jam ;
 include builtin_w32_getregnames.jam ;
+include option_d2.jam ;
 include option_n.jam ;
 include parallel_actions.jam ;
 include stress_var_expand.jam ;