Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r55332 - in trunk/tools/build/v2/test: . generators-test
From: ghost_at_[hidden]
Date: 2009-08-01 06:31:06


Author: vladimir_prus
Date: 2009-08-01 06:31:05 EDT (Sat, 01 Aug 2009)
New Revision: 55332
URL: http://svn.boost.org/trac/boost/changeset/55332

Log:
Testsuite fixes for windows.

Text files modified:
   trunk/tools/build/v2/test/generators-test/extra.jam | 13 +++++++++----
   trunk/tools/build/v2/test/generators-test/nm.jam | 6 +++++-
   trunk/tools/build/v2/test/notfile.py | 2 +-
   3 files changed, 15 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/test/generators-test/extra.jam
==============================================================================
--- trunk/tools/build/v2/test/generators-test/extra.jam (original)
+++ trunk/tools/build/v2/test/generators-test/extra.jam 2009-08-01 06:31:05 EDT (Sat, 01 Aug 2009)
@@ -65,7 +65,10 @@
 actions whale
 {
     echo "Whale consuming " $(>)
- $(TOUCH) $(<)
+ $(TOUCH) $(<[1])
+ $(TOUCH) $(<[2])
+ $(TOUCH) $(<[3])
+ $(TOUCH) $(<[4])
 }
 
 rule dolphin ( targets * : source * : properties * )
@@ -85,7 +88,8 @@
 actions wd
 {
     echo "WD consuming" $(>)
- $(TOUCH) $(<)
+ $(TOUCH) $(<[1])
+ $(TOUCH) $(<[2])
 }
 
 rule x ( target * : source * : properties * )
@@ -96,7 +100,7 @@
 actions x
 {
     echo "X: source is " $(>)
- $(TOUCH) $(<)
+ $(TOUCH) $(<[1])
 }
 
 rule x_pro ( target * : source * : properties * )
@@ -107,7 +111,8 @@
 actions x_pro
 {
     echo "X_PRO: source is " $(>)
- $(TOUCH) $(<)
+ $(TOUCH) $(<[1])
+ $(TOUCH) $(<[2])
 }
 
 

Modified: trunk/tools/build/v2/test/generators-test/nm.jam
==============================================================================
--- trunk/tools/build/v2/test/generators-test/nm.jam (original)
+++ trunk/tools/build/v2/test/generators-test/nm.jam 2009-08-01 06:31:05 EDT (Sat, 01 Aug 2009)
@@ -4,6 +4,9 @@
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
 import modules ;
+import common ;
+
+TOUCH = [ common.file-touch-command ] ;
 
 rule target-source ( targets * : sources * : properties * )
 {
@@ -30,7 +33,8 @@
 actions cpp-mark
 {
     echo "CPP-MARK consuming " $(>)
- touch $(<)
+ $(TOUCH) $(<[1])
+ $(TOUCH) $(<[2])
 }
 
 

Modified: trunk/tools/build/v2/test/notfile.py
==============================================================================
--- trunk/tools/build/v2/test/notfile.py (original)
+++ trunk/tools/build/v2/test/notfile.py 2009-08-01 06:31:05 EDT (Sat, 01 Aug 2009)
@@ -22,7 +22,7 @@
 
 actions valgrind
 {
- valgrind $(>)
+ valgrind $(>[1])
 }
 """)
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk