[Boost-commit] svn:boost r49275 - in trunk/libs/filesystem/test: . msvc/mbcopy

Subject: [Boost-commit] svn:boost r49275 - in trunk/libs/filesystem/test: . msvc/mbcopy
From: bdawes_at_[hidden]
Date: 2008-10-11 08:28:21

Author: bemandawes
Date: 2008-10-11 08:28:21 EDT (Sat, 11 Oct 2008)
New Revision: 49275
URL: http://svn.boost.org/trac/boost/changeset/49275

Log:
Filesystem: apply #2395 operations_test regression test fails on MSVC with STDCXX 
Text files modified: 
   trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj |     8 ++++----                                
   trunk/libs/filesystem/test/operations_test.cpp       |     8 ++++++--                                
   2 files changed, 10 insertions(+), 6 deletions(-)

Modified: trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj
==============================================================================
--- trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj	(original)
+++ trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj	2008-10-11 08:28:21 EDT (Sat, 11 Oct 2008)
@@ -86,8 +86,8 @@
                         />
                         <Tool
                                 Name="VCPostBuildEventTool"
-				Description="Executing test $(TargetName).exe..."
-				CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
+				Description=""
+				CommandLine=""
                         />
                 </Configuration>
                 <Configuration
@@ -163,8 +163,8 @@
                         />
                         <Tool
                                 Name="VCPostBuildEventTool"
-				Description="Executing test $(TargetName).exe..."
-				CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
+				Description=""
+				CommandLine=""
                         />
                 </Configuration>
         </Configurations>

Modified: trunk/libs/filesystem/test/operations_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_test.cpp	(original)
+++ trunk/libs/filesystem/test/operations_test.cpp	2008-10-11 08:28:21 EDT (Sat, 11 Oct 2008)
@@ -28,6 +28,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <cstring> // for strncmp, etc.
 #include <ctime>
 #include <cstdlib> // for system()
 
@@ -146,8 +147,11 @@
       exception_thrown = true;
       if ( report_throws ) std::cout << x.what() << std::endl;
       if ( platform == "Windows" && language_id == 0x0409 ) // English (United States)
-        BOOST_CHECK( std::strcmp( x.what(),
-          "boost::filesystem::create_directory" ) == 0 );
+        // the stdcxx standard library apparently appends additional info
+        // to what(), so check only the initial portion: 
+        BOOST_CHECK( std::strncmp( x.what(),
+          "boost::filesystem::create_directory",
+          sizeof("boost::filesystem::create_directory")-1 ) == 0 );
     }
     BOOST_CHECK( exception_thrown );