[Boost-commit] svn:boost r59603 - in sandbox/filesystem-v3/libs/filesystem: src test

Subject: [Boost-commit] svn:boost r59603 - in sandbox/filesystem-v3/libs/filesystem: src test
From: bdawes_at_[hidden]
Date: 2010-02-09 16:55:21

Author: bemandawes
Date: 2010-02-09 16:55:20 EST (Tue, 09 Feb 2010)
New Revision: 59603
URL: http://svn.boost.org/trac/boost/changeset/59603

Log:
Linux test fixes
Text files modified: 
   sandbox/filesystem-v3/libs/filesystem/src/path.cpp                  |     2 +-                                      
   sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp |     9 ++++++---                               
   sandbox/filesystem-v3/libs/filesystem/test/path_test.cpp            |     2 ++                                      
   sandbox/filesystem-v3/libs/filesystem/test/path_unit_test.cpp       |     7 ++++++-                                 
   4 files changed, 15 insertions(+), 5 deletions(-)

Modified: sandbox/filesystem-v3/libs/filesystem/src/path.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/src/path.cpp	(original)
+++ sandbox/filesystem-v3/libs/filesystem/src/path.cpp	2010-02-09 16:55:20 EST (Tue, 09 Feb 2010)
@@ -216,7 +216,7 @@
     path base_root_name (base.root_name());
     path this_root_directory (root_directory());
 
-#   ifndef BOOST_WINDOWS_PATH
+#   ifdef BOOST_WINDOWS_PATH
     BOOST_ASSERT(!this_root_name.empty() || !base_root_name.empty());
 #   endif
 

Modified: sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp	(original)
+++ sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp	2010-02-09 16:55:20 EST (Tue, 09 Feb 2010)
@@ -7,6 +7,11 @@
 
 //  Library home page: http://www.boost.org/libs/filesystem
 
+#include <boost/config/warning_disable.hpp>
+
+//  See deprecated_test for tests of deprecated features
+#define BOOST_FILESYSTEM_NO_DEPRECATED
+
 #include <iostream>
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
@@ -111,8 +116,6 @@
 
     error_code ec;
 
-    CHECK(complete("foo", "c:/") == "c:/foo");
-
     CHECK(!create_directory("/", ec));
 
     CHECK(!boost::filesystem::remove("no-such-file-or-directory"));
@@ -158,7 +161,7 @@
   cout << "BOOST_WINDOWS_API\n";
 #endif
 #ifdef BOOST_POSIX_PATH
-  cout << "BOOST_PATH_API\n";
+  cout << "BOOST_POSIX_PATH\n";
 #endif
 #ifdef BOOST_WINDOWS_PATH
   cout << "BOOST_WINDOWS_PATH\n";

Modified: sandbox/filesystem-v3/libs/filesystem/test/path_test.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/path_test.cpp	(original)
+++ sandbox/filesystem-v3/libs/filesystem/test/path_test.cpp	2010-02-09 16:55:20 EST (Tue, 09 Feb 2010)
@@ -13,6 +13,8 @@
 //  on basename(), extension(), and change_extension() tests from the original
 //  convenience_test.cpp by Vladimir Prus.
 
+#include <boost/config/warning_disable.hpp>
+
 //  See deprecated_test for tests of deprecated features
 #define BOOST_FILESYSTEM_NO_DEPRECATED
 

Modified: sandbox/filesystem-v3/libs/filesystem/test/path_unit_test.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/path_unit_test.cpp	(original)
+++ sandbox/filesystem-v3/libs/filesystem/test/path_unit_test.cpp	2010-02-09 16:55:20 EST (Tue, 09 Feb 2010)
@@ -19,6 +19,11 @@
 //
 //  ----------------------------------------------------------------------------------  //
 
+#include <boost/config/warning_disable.hpp>
+
+//  See deprecated_test for tests of deprecated features
+#define BOOST_FILESYSTEM_NO_DEPRECATED
+
 #include <boost/filesystem/path.hpp>
 #include "../src/utf8_codecvt_facet.hpp"  // for imbue tests
 #include <boost/detail/lightweight_test.hpp>
@@ -458,7 +463,7 @@
     CHECK(path("baa").absolute("/") == "/baa"); 
     CHECK(path("/baa").absolute("/foo").string() == path("/baa").string()); 
     CHECK(path("baa/baz").absolute("/foo/bar").string()
-      == path("/foo/bar\\baa/baz").string());
+      == path("/foo/bar/baa/baz").string());
 #   endif
   }