Browse Source

[1186] Removed libdhcp_unittests on libutil_unitests.la

Tomek Mrugalski 13 years ago
parent
commit
e9c6c3cf86
2 changed files with 4 additions and 4 deletions
  1. 0 2
      src/lib/dhcp/tests/Makefile.am
  2. 4 2
      src/lib/dhcp/tests/run_unittests.cc

+ 0 - 2
src/lib/dhcp/tests/Makefile.am

@@ -34,11 +34,9 @@ libdhcp_unittests_CXXFLAGS += -Wno-unused-variable
 endif
 libdhcp_unittests_LDADD  = $(GTEST_LDADD)
 libdhcp_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
-libdhcp_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 libdhcp_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
 libdhcp_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
 libdhcp_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
-libdhcp_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 endif
 
 noinst_PROGRAMS = $(TESTS)

+ 4 - 2
src/lib/dhcp/tests/run_unittests.cc

@@ -13,7 +13,6 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <gtest/gtest.h>
-#include <util/unittests/run_all.h>
 
 #include <log/logger_support.h>
 
@@ -21,5 +20,8 @@ int
 main(int argc, char* argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
     isc::log::initLogger();
-    return (isc::util::unittests::run_all());
+
+    int result = RUN_ALL_TESTS();
+
+    return (result);
 }