[Boost-commit] svn:boost r86526 - trunk/libs/heap/test

Subject: [Boost-commit] svn:boost r86526 - trunk/libs/heap/test
From: tim_at_[hidden]
Date: 2013-10-30 14:23:01

Author: timblechmann
Date: 2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)
New Revision: 86526
URL: http://svn.boost.org/trac/boost/changeset/86526

Log:
heap: possible fix for testsuite

Text files modified: 
   trunk/libs/heap/test/Jamfile.v2              |     2 +-                                      
   trunk/libs/heap/test/binomial_heap_test.cpp  |     4 ----                                    
   trunk/libs/heap/test/fibonacci_heap_test.cpp |     5 -----                                   
   trunk/libs/heap/test/pairing_heap_tests.cpp  |     5 -----                                   
   trunk/libs/heap/test/skew_heap_test.cpp      |     5 -----                                   
   5 files changed, 1 insertions(+), 20 deletions(-)

Modified: trunk/libs/heap/test/Jamfile.v2
==============================================================================
--- trunk/libs/heap/test/Jamfile.v2	Wed Oct 30 14:21:57 2013	(r86525)
+++ trunk/libs/heap/test/Jamfile.v2	2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)	(r86526)
@@ -10,7 +10,7 @@
 
    for local fileb in [ glob *.cpp ]
    {
-       all_rules += [ run $(fileb) ../../test/build//boost_unit_test_framework/<link>static
+       all_rules += [ run $(fileb)
       :  # additional args
       :  # test-files
       : <library>/boost/test//boost_unit_test_framework # requirements

Modified: trunk/libs/heap/test/binomial_heap_test.cpp
==============================================================================
--- trunk/libs/heap/test/binomial_heap_test.cpp	Wed Oct 30 14:21:57 2013	(r86525)
+++ trunk/libs/heap/test/binomial_heap_test.cpp	2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)	(r86526)
@@ -7,11 +7,7 @@
 =============================================================================*/
 
 #define BOOST_TEST_MAIN
-#ifdef BOOST_HEAP_INCLUDE_TESTS
-#include <boost/test/included/unit_test.hpp>
-#else
 #include <boost/test/unit_test.hpp>
-#endif
 
 #include <algorithm>
 

Modified: trunk/libs/heap/test/fibonacci_heap_test.cpp
==============================================================================
--- trunk/libs/heap/test/fibonacci_heap_test.cpp	Wed Oct 30 14:21:57 2013	(r86525)
+++ trunk/libs/heap/test/fibonacci_heap_test.cpp	2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)	(r86526)
@@ -7,12 +7,7 @@
 =============================================================================*/
 
 #define BOOST_TEST_MAIN
-#ifdef BOOST_HEAP_INCLUDE_TESTS
-#include <boost/test/included/unit_test.hpp>
-#else
 #include <boost/test/unit_test.hpp>
-#endif
-
 
 #include <algorithm>
 

Modified: trunk/libs/heap/test/pairing_heap_tests.cpp
==============================================================================
--- trunk/libs/heap/test/pairing_heap_tests.cpp	Wed Oct 30 14:21:57 2013	(r86525)
+++ trunk/libs/heap/test/pairing_heap_tests.cpp	2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)	(r86526)
@@ -7,12 +7,7 @@
 =============================================================================*/
 
 #define BOOST_TEST_MAIN
-#ifdef BOOST_HEAP_INCLUDE_TESTS
-#include <boost/test/included/unit_test.hpp>
-#else
 #include <boost/test/unit_test.hpp>
-#endif
-
 
 #include <algorithm>
 

Modified: trunk/libs/heap/test/skew_heap_test.cpp
==============================================================================
--- trunk/libs/heap/test/skew_heap_test.cpp	Wed Oct 30 14:21:57 2013	(r86525)
+++ trunk/libs/heap/test/skew_heap_test.cpp	2013-10-30 14:23:01 EDT (Wed, 30 Oct 2013)	(r86526)
@@ -7,12 +7,7 @@
 =============================================================================*/
 
 #define BOOST_TEST_MAIN
-#ifdef BOOST_HEAP_INCLUDE_TESTS
-#include <boost/test/included/unit_test.hpp>
-#else
 #include <boost/test/unit_test.hpp>
-#endif
-
 
 #include <algorithm>