[Boost-commit] svn:boost r75855 - in trunk/tools/build/v2/test: . test2

Subject: [Boost-commit] svn:boost r75855 - in trunk/tools/build/v2/test: . test2
From: steven_at_[hidden]
Date: 2011-12-07 12:45:55

Author: steven_watanabe
Date: 2011-12-07 12:45:52 EST (Wed, 07 Dec 2011)
New Revision: 75855
URL: http://svn.boost.org/trac/boost/changeset/75855

Log:
Fix the two example tests.
Added:
   trunk/tools/build/v2/test/test2/jamroot.jam
      - copied, changed from r75600, /trunk/tools/build/v2/test/test2/jamfile.jam
Removed:
   trunk/tools/build/v2/test/test2/Jamrules
   trunk/tools/build/v2/test/test2/jamfile.jam
Text files modified: 
   trunk/tools/build/v2/test/test1.py          |     4 ++--                                    
   trunk/tools/build/v2/test/test2.py          |     4 ++--                                    
   trunk/tools/build/v2/test/test2/jamroot.jam |     3 ---                                     
   3 files changed, 4 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/test/test1.py
==============================================================================
--- trunk/tools/build/v2/test/test1.py	(original)
+++ trunk/tools/build/v2/test/test1.py	2011-12-07 12:45:52 EST (Wed, 07 Dec 2011)
@@ -6,7 +6,7 @@
 
 import BoostBuild
 
-t = BoostBuild.Tester()
+t = BoostBuild.Tester(pass_toolset=0)
 
 t.write("test.jam", """
 actions unbuilt { }
@@ -15,4 +15,4 @@
 """)
 
 t.run_build_system("-ftest.jam", stdout="Hi\n")
-t.pass_test()
+t.cleanup()

Modified: trunk/tools/build/v2/test/test2.py
==============================================================================
--- trunk/tools/build/v2/test/test2.py	(original)
+++ trunk/tools/build/v2/test/test2.py	2011-12-07 12:45:52 EST (Wed, 07 Dec 2011)
@@ -11,7 +11,7 @@
 
 t.set_tree("test2")
 
-file_list = 'bin/foo/$toolset/debug/runtime-link-dynamic/' * \
+file_list = 'bin/$toolset/debug/' * \
     BoostBuild.List("foo foo.o")
 
 t.run_build_system("-sBOOST_BUILD_PATH=" + t.original_workdir + "/..")
@@ -22,4 +22,4 @@
 t.run_build_system("-d2 -sBOOST_BUILD_PATH=" + t.original_workdir + "/..")
 t.expect_touch(file_list)
 
-t.pass_test()
+t.cleanup()

Deleted: trunk/tools/build/v2/test/test2/Jamrules
==============================================================================

Deleted: trunk/tools/build/v2/test/test2/jamfile.jam
==============================================================================
--- trunk/tools/build/v2/test/test2/jamfile.jam	2011-12-07 12:45:52 EST (Wed, 07 Dec 2011)
+++ (empty file)
@@ -1,8 +0,0 @@
-# Copyright 2002 Vladimir Prus 
-# 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) 
-
-
-project-root ;
-
-exe foo : foo.cpp ;

Copied: trunk/tools/build/v2/test/test2/jamroot.jam (from r75600, /trunk/tools/build/v2/test/test2/jamfile.jam)
==============================================================================
--- /trunk/tools/build/v2/test/test2/jamfile.jam	(original)
+++ trunk/tools/build/v2/test/test2/jamroot.jam	2011-12-07 12:45:52 EST (Wed, 07 Dec 2011)
@@ -2,7 +2,4 @@
 # 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) 
 
-
-project-root ;
-
 exe foo : foo.cpp ;