BIND 10 trac1704_2, updated. 30198a34b9e464ffa2947955e7dd70a191e39682 [1704] Use top_builddir during tests as top_srcdir may not be writable
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 24 08:00:14 UTC 2012
The branch, trac1704_2 has been updated
via 30198a34b9e464ffa2947955e7dd70a191e39682 (commit)
from c0a328b2d94321966d5ebe97dd8f2058d6d76176 (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 30198a34b9e464ffa2947955e7dd70a191e39682
Author: Mukund Sivaraman <muks at isc.org>
Date: Thu May 24 13:11:37 2012 +0530
[1704] Use top_builddir during tests as top_srcdir may not be writable
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/tests/Makefile.am | 2 +-
src/lib/log/tests/console_test.sh.in | 2 +-
src/lib/log/tests/destination_test.sh.in | 2 +-
src/lib/log/tests/init_logger_test.sh.in | 2 +-
src/lib/log/tests/local_file_test.sh.in | 2 +-
src/lib/log/tests/run_initializer_unittests.cc | 2 +-
src/lib/log/tests/run_unittests.cc | 2 +-
src/lib/log/tests/severity_test.sh.in | 2 +-
src/lib/python/isc/log/tests/Makefile.am | 2 +-
src/lib/util/tests/Makefile.am | 1 -
src/lib/util/tests/run_unittests.cc | 2 +-
11 files changed, 10 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 8d53aad..844ef95 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += -DTOP_SRCDIR=\"${abs_top_srcdir}\"
+AM_CPPFLAGS += -DTOP_BUILDDIR=\"${abs_top_builddir}\"
AM_CXXFLAGS = $(B10_CXXFLAGS)
AM_LDADD =
AM_LDFLAGS =
diff --git a/src/lib/log/tests/console_test.sh.in b/src/lib/log/tests/console_test.sh.in
index 2b3e6ac..5540b26 100755
--- a/src/lib/log/tests/console_test.sh.in
+++ b/src/lib/log/tests/console_test.sh.in
@@ -16,7 +16,7 @@
# The logger supports the idea of a "console" logger than logs to either stdout
# or stderr. This test checks that both these options work.
-export B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE=@abs_top_builddir@
testname="Console output test"
echo $testname
diff --git a/src/lib/log/tests/destination_test.sh.in b/src/lib/log/tests/destination_test.sh.in
index 722b9a5..43cb02a 100755
--- a/src/lib/log/tests/destination_test.sh.in
+++ b/src/lib/log/tests/destination_test.sh.in
@@ -15,7 +15,7 @@
# Checks that the logger will route messages to the chosen destination.
-export B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE=@abs_top_builddir@
testname="Destination test"
echo $testname
diff --git a/src/lib/log/tests/init_logger_test.sh.in b/src/lib/log/tests/init_logger_test.sh.in
index 5e05531..3710258 100755
--- a/src/lib/log/tests/init_logger_test.sh.in
+++ b/src/lib/log/tests/init_logger_test.sh.in
@@ -16,7 +16,7 @@
# Checks that the initLogger() call uses for unit tests respects the setting of
# the environment variables.
-export B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE=@abs_top_builddir@
testname="initLogger test"
echo $testname
diff --git a/src/lib/log/tests/local_file_test.sh.in b/src/lib/log/tests/local_file_test.sh.in
index 6ee4aec..8d28eef 100755
--- a/src/lib/log/tests/local_file_test.sh.in
+++ b/src/lib/log/tests/local_file_test.sh.in
@@ -16,7 +16,7 @@
# Checks that a local message file can override the definitions in the message
# dictionary.
-export B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE=@abs_top_builddir@
testname="Local message file test"
echo $testname
diff --git a/src/lib/log/tests/run_initializer_unittests.cc b/src/lib/log/tests/run_initializer_unittests.cc
index aadfa49..cd069d8 100644
--- a/src/lib/log/tests/run_initializer_unittests.cc
+++ b/src/lib/log/tests/run_initializer_unittests.cc
@@ -21,6 +21,6 @@
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
- setenv("B10_FROM_SOURCE", TOP_SRCDIR, 1);
+ setenv("B10_FROM_SOURCE", TOP_BUILDDIR, 1);
return (isc::util::unittests::run_all());
}
diff --git a/src/lib/log/tests/run_unittests.cc b/src/lib/log/tests/run_unittests.cc
index 1376a91..2b4d9ea 100644
--- a/src/lib/log/tests/run_unittests.cc
+++ b/src/lib/log/tests/run_unittests.cc
@@ -21,7 +21,7 @@
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
- setenv("B10_FROM_SOURCE", TOP_SRCDIR, 1);
+ setenv("B10_FROM_SOURCE", TOP_BUILDDIR, 1);
isc::log::initLogger();
return (isc::util::unittests::run_all());
}
diff --git a/src/lib/log/tests/severity_test.sh.in b/src/lib/log/tests/severity_test.sh.in
index c88b117..912ad4e 100755
--- a/src/lib/log/tests/severity_test.sh.in
+++ b/src/lib/log/tests/severity_test.sh.in
@@ -16,7 +16,7 @@
# Checks that the logger will limit the output of messages less severe than
# the severity/debug setting.
-export B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE=@abs_top_builddir@
testname="Severity test"
echo $testname
diff --git a/src/lib/python/isc/log/tests/Makefile.am b/src/lib/python/isc/log/tests/Makefile.am
index 4f96c0b..d47e354 100644
--- a/src/lib/python/isc/log/tests/Makefile.am
+++ b/src/lib/python/isc/log/tests/Makefile.am
@@ -28,7 +28,7 @@ endif
$(LIBRARY_PATH_PLACEHOLDER) \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/lib/python/isc/log:$(abs_top_builddir)/src/lib/log/python/.libs \
B10_TEST_PLUGIN_DIR=$(abs_top_srcdir)/src/bin/cfgmgr/plugins \
- B10_FROM_SOURCE=$(abs_top_srcdir) \
+ B10_FROM_SOURCE=$(abs_top_builddir) \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done ; \
for pytest in $(PYTESTS_GEN) ; do \
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index a34b2de..e1cdd6b 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_builddir)\"
# used to bind a UNIX domain socket so we can minimize the risk of exceeding
# the limit of file name path size.
AM_CPPFLAGS += -DTEST_DATA_TOPBUILDDIR=\"$(abs_top_builddir)\"
-AM_CPPFLAGS += -DTOP_SRCDIR=\"${abs_top_srcdir}\"
AM_CXXFLAGS = $(B10_CXXFLAGS)
if USE_STATIC_LINK
diff --git a/src/lib/util/tests/run_unittests.cc b/src/lib/util/tests/run_unittests.cc
index b89be8d..0be7247 100644
--- a/src/lib/util/tests/run_unittests.cc
+++ b/src/lib/util/tests/run_unittests.cc
@@ -20,6 +20,6 @@ int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
- setenv("B10_FROM_SOURCE", TOP_SRCDIR, 1);
+ setenv("B10_FROM_SOURCE", TEST_DATA_TOPBUILDDIR, 1);
return (isc::util::unittests::run_all());
}
More information about the bind10-changes
mailing list