BIND 10 master, updated. 0422339a5a2c934aec17869b8096f263d6cae922 [master] set B10_FROM_BUILD in auth tests

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Apr 17 13:42:00 UTC 2012


The branch, master has been updated
       via  0422339a5a2c934aec17869b8096f263d6cae922 (commit)
      from  89071a214099a1de3ce7253e4f91fa4bc8d00272 (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 0422339a5a2c934aec17869b8096f263d6cae922
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Apr 17 15:40:49 2012 +0200

    [master] set B10_FROM_BUILD in auth tests
    
    So that the sqlite3_ds.so is found correctly
    This has been acked on jabber, and is tentatively waiting full resolution in ticket #1895

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/tests/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index b33c7af..2fd4b15 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -19,10 +19,11 @@ endif
 
 CLEANFILES = *.gcno *.gcda
 
+# Do not define global tests, use check-local so
+# environment can be set (needed for dynamic loading)
 TESTS =
 if HAVE_GTEST
 
-TESTS += run_unittests
 run_unittests_SOURCES = $(top_srcdir)/src/lib/dns/tests/unittest_util.h
 run_unittests_SOURCES += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc
 run_unittests_SOURCES += ../auth_srv.h ../auth_srv.cc
@@ -70,6 +71,8 @@ run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
 run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libstatistics.la
+
+check-local:
+       B10_FROM_BUILD=${abs_top_builddir} ./run_unittests
 endif
 
-noinst_PROGRAMS = $(TESTS)



More information about the bind10-changes mailing list