From 44c3831e0598190f07db8dda4ecf8c7d61964ce1 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 23 Nov 2009 16:39:45 +0000
Subject: [PATCH] Fix Jamfile and Boost.Test usage.

[SVN r57866]
---
 test/Jamfile.v2              | 12 ++++++------
 test/integer_traits_test.cpp |  1 -
 test/static_log2_test.cpp    |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 1609bf5..6111059 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -6,15 +6,15 @@ import testing ;
 
 test-suite integer
     :   [ run cstdint_test.cpp ]
-        [ run integer_test.cpp
-            /boost/test//boost_unit_test_framework ]
+        [ run integer_test.cpp 
+            /boost/test//minimal ]
         [ run integer_traits_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
+            /boost/test//boost_test_exec_monitor ]
         [ run integer_mask_test.cpp
-            /boost/test//boost_unit_test_framework ]
+            /boost/test//minimal ]
         [ run static_log2_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
+            /boost/test//boost_test_exec_monitor ]
         [ run static_min_max_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
+            /boost/test//boost_test_exec_monitor ]
 #        [ compile issue_2134.cpp ]
     ;
diff --git a/test/integer_traits_test.cpp b/test/integer_traits_test.cpp
index e3de239..065f90a 100644
--- a/test/integer_traits_test.cpp
+++ b/test/integer_traits_test.cpp
@@ -17,7 +17,6 @@
 // use int64_t instead of long long for better portability
 #include <boost/cstdint.hpp>
 
-#define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>
 
 /*
diff --git a/test/static_log2_test.cpp b/test/static_log2_test.cpp
index 68628f6..00446e3 100644
--- a/test/static_log2_test.cpp
+++ b/test/static_log2_test.cpp
@@ -10,7 +10,6 @@
 //  Revision History
 //  01 Oct 2001  Initial version (Daryle Walker)
 
-#define  BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>  // for main
 
 #include <boost/cstdlib.hpp>              // for boost::exit_success