[nemiver] Fix tests linking with boost 1.46
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver] Fix tests linking with boost 1.46
- Date: Fri, 1 Apr 2011 19:01:57 +0000 (UTC)
commit cf037e41b8a83c805c9e5a7c1e3d0a4788f894e1
Author: Dodji Seketeli <dodji gnome org>
Date: Fri Apr 1 20:37:20 2011 +0200
Fix tests linking with boost 1.46
* tests/Makefile.am (runtestvarobjwalker)
(runtestvariableformat, runtestvarlist, runtestvarwalker): Don't
link these tests with (useless) @BOOST_TEST_EXEC_MONITOR_LIB@
anymore.
(runtesttypes): Don't link with
BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB anymore.
* tests/test-overloads.cc: Don't include boost/test/test_tools.hpp
as it is redundant with boost/test/minimal.hpp.
* tests/test-var-walker.cc: Likewise.
* tests/test-variable-format.cc: Likewise.
* tests/test-varobj-walker.cc: Likewise.
tests/Makefile.am | 11 +++++------
tests/test-overloads.cc | 1 -
tests/test-var-walker.cc | 1 -
tests/test-variable-format.cc | 1 -
tests/test-varobj-walker.cc | 1 -
5 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 03d6ab0..04f9549 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -65,17 +65,17 @@ $(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
runtestvarobjwalker_SOURCES=$(h)/test-varobj-walker.cc
-runtestvarobjwalker_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
+runtestvarobjwalker_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
runtestvariableformat_SOURCES=$(h)/test-variable-format.cc
-runtestvariableformat_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
+runtestvariableformat_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
#runtestoverloads_SOURCES=$(h)/test-overloads.cc
-#runtestoverloads_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
+#runtestoverloads_LDADD= NEMIVERCOMMON_LIBS@ \
#$(top_builddir)/src/common/libnemivercommon.la
runtestcore_SOURCES=$(h)/test-core.cc
@@ -103,12 +103,12 @@ $(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
runtestvarlist_SOURCES=$(h)/test-var-list.cc
-runtestvarlist_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
+runtestvarlist_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
runtestvarwalker_SOURCES=$(h)/test-var-walker.cc
-runtestvarwalker_LDADD= NEMIVERCOMMON_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIB@ \
+runtestvarwalker_LDADD= NEMIVERCOMMON_LIBS@ \
$(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
@@ -151,7 +151,6 @@ $(top_builddir)/src/common/libnemivercommon.la
runtesttypes_SOURCES=$(h)/test-types.cc
runtesttypes_LDADD= NEMIVERCOMMON_LIBS@ \
- BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
$(top_builddir)/src/common/libnemivercommon.la \
$(top_builddir)/src/dbgengine/libdebuggerutils.la
diff --git a/tests/test-overloads.cc b/tests/test-overloads.cc
index e24b02b..7cc81da 100644
--- a/tests/test-overloads.cc
+++ b/tests/test-overloads.cc
@@ -1,5 +1,4 @@
#include <iostream>
-#include <boost/test/test_tools.hpp>
#include <boost/test/minimal.hpp>
#include <glibmm.h>
#include "common/nmv-initializer.h"
diff --git a/tests/test-var-walker.cc b/tests/test-var-walker.cc
index ab847c8..22c91a0 100644
--- a/tests/test-var-walker.cc
+++ b/tests/test-var-walker.cc
@@ -1,7 +1,6 @@
#include <iostream>
#include <map>
#include <string>
-#include <boost/test/test_tools.hpp>
#include <boost/test/minimal.hpp>
#include <glibmm.h>
#include "common/nmv-initializer.h"
diff --git a/tests/test-variable-format.cc b/tests/test-variable-format.cc
index 1268d64..49331f2 100644
--- a/tests/test-variable-format.cc
+++ b/tests/test-variable-format.cc
@@ -2,7 +2,6 @@
#include <sstream>
#include <map>
#include <string>
-#include <boost/test/test_tools.hpp>
#include <boost/test/minimal.hpp>
#include <glibmm.h>
#include "common/nmv-initializer.h"
diff --git a/tests/test-varobj-walker.cc b/tests/test-varobj-walker.cc
index 7518d03..05724a8 100644
--- a/tests/test-varobj-walker.cc
+++ b/tests/test-varobj-walker.cc
@@ -2,7 +2,6 @@
#include <sstream>
#include <map>
#include <string>
-#include <boost/test/test_tools.hpp>
#include <boost/test/minimal.hpp>
#include <glibmm.h>
#include "common/nmv-initializer.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]