[1704] Use top_builddir during tests as top_srcdir may not be writable

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  =

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

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

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

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

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

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

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

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 \

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

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