diff options
| author | Stephen Morris <stephen@isc.org> | 2011-05-11 18:27:10 +0200 |
|---|---|---|
| committer | Stephen Morris <stephen@isc.org> | 2011-05-11 18:27:10 +0200 |
| commit | e3ab39868457157166a8b7b2f1753555409426b9 (patch) | |
| tree | d1faf73fa0cd663f06d543b9ac1df57f198b316d /src/lib/cryptolink/tests | |
| parent | [trac542] Remove typeid from exception caught message (diff) | |
| download | kea-e3ab39868457157166a8b7b2f1753555409426b9.tar.xz kea-e3ab39868457157166a8b7b2f1753555409426b9.zip | |
[trac542] Convert RUN_ALL_TESTS() to call to isc::util::unittest::run_all()
Also update the test Makefile.am files to include the appropriate libraries.
Diffstat (limited to 'src/lib/cryptolink/tests')
| -rw-r--r-- | src/lib/cryptolink/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/cryptolink/tests/run_unittests.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am index c8b5e266f4..4c7ef05b3d 100644 --- a/src/lib/cryptolink/tests/Makefile.am +++ b/src/lib/cryptolink/tests/Makefile.am @@ -19,6 +19,8 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la +run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la +run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la endif diff --git a/src/lib/cryptolink/tests/run_unittests.cc b/src/lib/cryptolink/tests/run_unittests.cc index d16327e0d3..a2181cf47d 100644 --- a/src/lib/cryptolink/tests/run_unittests.cc +++ b/src/lib/cryptolink/tests/run_unittests.cc @@ -13,10 +13,11 @@ // PERFORMANCE OF THIS SOFTWARE. #include <gtest/gtest.h> +#include <util/unittests/run_all.h> int main(int argc, char* argv[]) { ::testing::InitGoogleTest(&argc, argv); - return (RUN_ALL_TESTS()); + return (isc::util::unittests::run_all()); } |