[Boost-commit] svn:boost r39293 - sandbox/libs/extension/test

From: oryol_at_[hidden]
Date: 2007-09-14 21:51:55

Author: jeremypack
Date: 2007-09-14 21:51:55 EDT (Fri, 14 Sep 2007)
New Revision: 39293
URL: http://svn.boost.org/trac/boost/changeset/39293

Log:
Fix these to use \ on windows and / everywhere else.

Text files modified: 
   sandbox/libs/extension/test/multiple_inheritance_test.cpp |    32 +++++++++++++++++++-------------        
   sandbox/libs/extension/test/parameters_test.cpp           |     9 +++++++--                               
   2 files changed, 26 insertions(+), 15 deletions(-)

Modified: sandbox/libs/extension/test/multiple_inheritance_test.cpp
==============================================================================
--- sandbox/libs/extension/test/multiple_inheritance_test.cpp	(original)
+++ sandbox/libs/extension/test/multiple_inheritance_test.cpp	2007-09-14 21:51:55 EDT (Fri, 14 Sep 2007)
@@ -27,7 +27,11 @@
 #define BOOST_TEST_DYN_LINK 1
 #include <boost/test/unit_test.hpp>
 
-
+#if defined(MSC_VER) || defined(WIN32)
+#define BOOST_EXTENSION_DIR_START "..\bin\"
+#else
+#define BOOST_EXTENSION_DIR_START "../bin/"
+#endif
 
 using namespace boost::extensions;
 
@@ -43,18 +47,20 @@
   // less descriptive
 
   // check if the libraries can be loaded
-  shared_library libVehicle((std::string("../bin/libVehicle") 
-                             + ".extension").c_str());
-  shared_library libCar((std::string("../bin/libCar") + ".extension").c_str());
-  shared_library libComputer((std::string("../bin/libComputer") 
-                              + ".extension").c_str());
-  shared_library libBoat((std::string("../bin/libBoat") + ".extension").c_str());
-  shared_library libFlyingCar((std::string("../bin/libFlyingCar") 
-                               + ".extension").c_str());
-  shared_library libCarOfTheFuture((std::string("../bin/libCarOfTheFuture") 
-                                    + ".extension").c_str());
-  shared_library libPlane((std::string("../bin/libPlane")
-                           + ".extension").c_str());
+  shared_library libVehicle((std::string(BOOST_EXTENSION_DIR_START) +
+                             "libVehicle.extension").c_str());
+  shared_library libCar((std::string(BOOST_EXTENSION_DIR_START) +
+                         "libCar.extension").c_str());
+  shared_library libComputer((std::string(BOOST_EXTENSION_DIR_START) +
+                              "libComputer.extension").c_str());
+  shared_library libBoat((std::string(BOOST_EXTENSION_DIR_START) +
+                          "libBoat.extension").c_str());
+  shared_library libFlyingCar((std::string(BOOST_EXTENSION_DIR_START) +
+                               "libFlyingCar.extension").c_str());
+  shared_library libCarOfTheFuture((std::string(BOOST_EXTENSION_DIR_START) +
+                                    "libCarOfTheFuture.extension").c_str());
+  shared_library libPlane((std::string(BOOST_EXTENSION_DIR_START) +
+                           "libPlane.extension").c_str());
   BOOST_CHECK_EQUAL( libVehicle.open(), true );
   BOOST_CHECK_EQUAL( libCar.open(), true );
   BOOST_CHECK_EQUAL( libComputer.open(), true );

Modified: sandbox/libs/extension/test/parameters_test.cpp
==============================================================================
--- sandbox/libs/extension/test/parameters_test.cpp	(original)
+++ sandbox/libs/extension/test/parameters_test.cpp	2007-09-14 21:51:55 EDT (Fri, 14 Sep 2007)
@@ -19,14 +19,19 @@
 
 #include "../examples/parameters/lots_of_parameters_iface.hpp"
 
+#if defined(MSC_VER) || defined(WIN32)
+#define BOOST_EXTENSION_DIR_START "..\bin\"
+#else
+#define BOOST_EXTENSION_DIR_START "../bin/"
+#endif
 
 using namespace boost::extensions;
 
 BOOST_AUTO_TEST_CASE(parameters_example)
 {
   // check if the library can be loaded
-  shared_library l((std::string("../bin/libParametersLib")
-                    + ".extension").c_str());
+  shared_library l((std::string(BOOST_EXTENSION_DIR_START) +
+                   "libParametersLib.extension").c_str());
   BOOST_CHECK_EQUAL( l.open(), true );
 
   // check if the factory can return the functor