BIND 10 trac1704_2, updated. 994827bfe0a9b77d3bf724768a2403965cb8ad57 [1704] Use B10_FROM_BUILD instead of B10_FROM_SOURCE
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 25 05:23:21 UTC 2012
The branch, trac1704_2 has been updated
via 994827bfe0a9b77d3bf724768a2403965cb8ad57 (commit)
via 39ebe9d1fd4d04690162c92ebb640f36fa2586ca (commit)
from 9227b2de28f57892f5570ca0f30f0f6c651922be (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 994827bfe0a9b77d3bf724768a2403965cb8ad57
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri May 25 10:53:10 2012 +0530
[1704] Use B10_FROM_BUILD instead of B10_FROM_SOURCE
commit 39ebe9d1fd4d04690162c92ebb640f36fa2586ca
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri May 25 10:48:45 2012 +0530
[1704] Don't set B10_FROM_SOURCE for logger unittest
-----------------------------------------------------------------------
Summary of changes:
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 | 1 -
src/lib/log/tests/severity_test.sh.in | 2 +-
src/lib/python/isc/log/tests/Makefile.am | 2 +-
src/lib/util/interprocess_sync_file.cc | 4 ++--
9 files changed, 9 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/console_test.sh.in b/src/lib/log/tests/console_test.sh.in
index 5540b26..da00124 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_builddir@
+export B10_FROM_BUILD=@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 43cb02a..94aaefd 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_builddir@
+export B10_FROM_BUILD=@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 3710258..ac80f65 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_builddir@
+export B10_FROM_BUILD=@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 8d28eef..d5daa45 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_builddir@
+export B10_FROM_BUILD=@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 cd069d8..23df7b8 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_BUILDDIR, 1);
+ setenv("B10_FROM_BUILD", 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 2b4d9ea..019a548 100644
--- a/src/lib/log/tests/run_unittests.cc
+++ b/src/lib/log/tests/run_unittests.cc
@@ -21,7 +21,6 @@
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
- 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 912ad4e..5390fee 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_builddir@
+export B10_FROM_BUILD=@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 d47e354..fe5144b 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_builddir) \
+ B10_FROM_BUILD=$(abs_top_builddir) \
$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done ; \
for pytest in $(PYTESTS_GEN) ; do \
diff --git a/src/lib/util/interprocess_sync_file.cc b/src/lib/util/interprocess_sync_file.cc
index b9a2d07..f035b7d 100644
--- a/src/lib/util/interprocess_sync_file.cc
+++ b/src/lib/util/interprocess_sync_file.cc
@@ -43,12 +43,12 @@ InterprocessSyncFile::do_lock(int cmd, short l_type) {
if (fd_ == -1) {
std::string lockfile_path = LOCKFILE_DIR;
- const char* const env = getenv("B10_FROM_SOURCE");
+ const char* const env = getenv("B10_FROM_BUILD");
if (env != NULL) {
lockfile_path = env;
}
- const char* const env2 = getenv("B10_FROM_SOURCE_LOCALSTATEDIR");
+ const char* const env2 = getenv("B10_FROM_BUILD_LOCALSTATEDIR");
if (env2 != NULL) {
lockfile_path = env2;
}
More information about the bind10-changes
mailing list