[Boost-commit] svn:boost r83885 - trunk/tools/build/v2/test

Subject: [Boost-commit] svn:boost r83885 - trunk/tools/build/v2/test
From: steven_at_[hidden]
Date: 2013-04-13 18:19:00

Author: steven_watanabe
Date: 2013-04-13 18:19:00 EDT (Sat, 13 Apr 2013)
New Revision: 83885
URL: http://svn.boost.org/trac/boost/changeset/83885

Log:
Fix file extension handling on Windows.
Text files modified: 
   trunk/tools/build/v2/test/MockToolset.py |     6 ++++++                                  
   trunk/tools/build/v2/test/zlib.py        |    16 ++++++++--------                        
   2 files changed, 14 insertions(+), 8 deletions(-)

Modified: trunk/tools/build/v2/test/MockToolset.py
==============================================================================
--- trunk/tools/build/v2/test/MockToolset.py	(original)
+++ trunk/tools/build/v2/test/MockToolset.py	2013-04-13 18:19:00 EDT (Sat, 13 Apr 2013)
@@ -144,9 +144,15 @@
 import path ;
 import modules ;
 import common ;
+import type ;
 
 .python-cmd = "\"%s\"" ;
 
+# Behave the same as gcc on Windows, because that's what
+# the test system expects
+type.set-generated-target-prefix SHARED_LIB : <toolset>mock <target-os>windows : lib ;
+type.set-generated-target-suffix STATIC_LIB : <toolset>mock <target-os>windows : a ;
+
 rule init ( )
 {
     local here = [ path.make [ modules.binding $(__name__) ] ] ;

Modified: trunk/tools/build/v2/test/zlib.py
==============================================================================
--- trunk/tools/build/v2/test/zlib.py	(original)
+++ trunk/tools/build/v2/test/zlib.py	2013-04-13 18:19:00 EDT (Sat, 13 Apr 2013)
@@ -59,8 +59,8 @@
 action('$test.o --static-lib=z -o $test')
 ''')
 t.run_build_system()
-t.expect_addition('bin/mock/debug/test')
-t.expect_addition('bin/mock/debug/link-static/test')
+t.expect_addition('bin/mock/debug/test.exe')
+t.expect_addition('bin/mock/debug/link-static/test.exe')
 
 # Default initialization - shared library
 t.rm('bin')
@@ -77,8 +77,8 @@
 action('$test.o --shared-lib=z -o $test')
 ''')
 t.run_build_system()
-t.expect_addition('bin/mock/debug/test')
-t.expect_addition('bin/mock/debug/link-static/test')
+t.expect_addition('bin/mock/debug/test.exe')
+t.expect_addition('bin/mock/debug/link-static/test.exe')
 
 # Initialization in explicit location - static library
 t.rm('bin')
@@ -96,8 +96,8 @@
 action('$test.o -L./zlib --static-lib=myzlib -o $test')
 ''')
 t.run_build_system()
-t.expect_addition('bin/mock/debug/test')
-t.expect_addition('bin/mock/debug/link-static/test')
+t.expect_addition('bin/mock/debug/test.exe')
+t.expect_addition('bin/mock/debug/link-static/test.exe')
 
 # Initialization in explicit location - shared library
 t.rm('bin')
@@ -113,7 +113,7 @@
 action('$test.o -L./zlib --shared-lib=myzlib -o $test')
 ''')
 t.run_build_system()
-t.expect_addition('bin/mock/debug/test')
-t.expect_addition('bin/mock/debug/link-static/test')
+t.expect_addition('bin/mock/debug/test.exe')
+t.expect_addition('bin/mock/debug/link-static/test.exe')
 
 t.cleanup()