BIND 10 trac542, updated. 24fd003fcc458c673803b953ca857a96bfa5183c [trac542] avoid relying on implicit conversion from pointer to bool
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 20 22:23:11 UTC 2011
The branch, trac542 has been updated
via 24fd003fcc458c673803b953ca857a96bfa5183c (commit)
via a9d323bf4df6aeb6333b057514b748d05febc1a9 (commit)
via e1df41b8ba21d04560ad4b65837bf7bb32fbdf34 (commit)
via 2af8dc8ec9301a935228568f80f8ba18531a3ffc (commit)
from ede93598806f8ddb21d193eb002fad8218416e40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 24fd003fcc458c673803b953ca857a96bfa5183c
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri May 20 12:49:45 2011 -0700
[trac542] avoid relying on implicit conversion from pointer to bool
commit a9d323bf4df6aeb6333b057514b748d05febc1a9
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri May 20 12:36:59 2011 -0700
[trac542] removed now-unnecessary LDADD of libutil_io.la (where appropriate)
commit e1df41b8ba21d04560ad4b65837bf7bb32fbdf34
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri May 20 12:22:11 2011 -0700
[trac542] fixed typo: s/std::Exception/std::exception/
commit 2af8dc8ec9301a935228568f80f8ba18531a3ffc
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri May 20 11:53:29 2011 -0700
[trac542] use our run_all() wrapper wherever possible.
the only exception is now lib/exceptions/tests, so add an explicit comment
about that.
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiodns/tests/Makefile.am | 1 -
src/lib/dns/tests/Makefile.am | 1 -
src/lib/exceptions/tests/run_unittests.cc | 3 +++
src/lib/util/io_tests/run_unittests.cc | 3 ++-
src/lib/util/tests/Makefile.am | 2 ++
src/lib/util/tests/run_unittests.cc | 4 +++-
src/lib/util/unittests/run_all.cc | 2 +-
src/lib/util/unittests/run_all.h | 2 +-
8 files changed, 12 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am
index 4198937..7e05c18 100644
--- a/src/lib/asiodns/tests/Makefile.am
+++ b/src/lib/asiodns/tests/Makefile.am
@@ -28,7 +28,6 @@ run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.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/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
diff --git a/src/lib/dns/tests/Makefile.am b/src/lib/dns/tests/Makefile.am
index 9783beb..b0a9672 100644
--- a/src/lib/dns/tests/Makefile.am
+++ b/src/lib/dns/tests/Makefile.am
@@ -58,7 +58,6 @@ run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.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/exceptions/libexceptions.la
endif
diff --git a/src/lib/exceptions/tests/run_unittests.cc b/src/lib/exceptions/tests/run_unittests.cc
index 0908071..6a0de4f 100644
--- a/src/lib/exceptions/tests/run_unittests.cc
+++ b/src/lib/exceptions/tests/run_unittests.cc
@@ -17,5 +17,8 @@
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
+
+ // Unlike other tests we cannot use our wrapper for RUN_ALL_TESTS()
+ // due to dependency.
return (RUN_ALL_TESTS());
}
diff --git a/src/lib/util/io_tests/run_unittests.cc b/src/lib/util/io_tests/run_unittests.cc
index e787ab1..8d6f722 100644
--- a/src/lib/util/io_tests/run_unittests.cc
+++ b/src/lib/util/io_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());
}
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 7b97202..2d193ad 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -35,6 +35,8 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
+run_unittests_LDADD += \
+ $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
diff --git a/src/lib/util/tests/run_unittests.cc b/src/lib/util/tests/run_unittests.cc
index bd3c4c9..a2181cf 100644
--- a/src/lib/util/tests/run_unittests.cc
+++ b/src/lib/util/tests/run_unittests.cc
@@ -13,9 +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());
}
diff --git a/src/lib/util/unittests/run_all.cc b/src/lib/util/unittests/run_all.cc
index 93c90d1..966de79 100644
--- a/src/lib/util/unittests/run_all.cc
+++ b/src/lib/util/unittests/run_all.cc
@@ -29,7 +29,7 @@ int
run_all() {
int ret = 0;
- if (getenv("B10TEST_CATCH_EXCEPTION")) {
+ if (getenv("B10TEST_CATCH_EXCEPTION") != NULL) {
try {
ret = RUN_ALL_TESTS();
} catch (const isc::Exception& ex) {
diff --git a/src/lib/util/unittests/run_all.h b/src/lib/util/unittests/run_all.h
index 48fd6fa..94c7cb0 100644
--- a/src/lib/util/unittests/run_all.h
+++ b/src/lib/util/unittests/run_all.h
@@ -32,7 +32,7 @@ namespace unittests {
/// B10TEST_CATCH_EXCEPTION is defined, and calls the macro directly if not.
///
/// The catch block catches exceptions of types isc::Exception and
-/// std::Exception and prints some information about them to stderr. (In the
+/// std::exception and prints some information about them to stderr. (In the
/// case of isc::Exception, this includes the file and line number from which
/// the exception was raised.) It then re-throws the exception.
///
More information about the bind10-changes
mailing list