Parcourir la source

[1704] Use B10_FROM_BUILD instead of B10_FROM_SOURCE

Mukund Sivaraman il y a 13 ans
Parent
commit
994827bfe0

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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());
 }

+ 1 - 1
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

+ 1 - 1
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 \

+ 2 - 2
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;
         }