BIND 10 master, updated. 3777aedaa6b570da2a0ba6d444b9401e7e34aee2 [master] remove the file generated by unittest

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Jul 25 22:15:18 UTC 2012


The branch, master has been updated
       via  3777aedaa6b570da2a0ba6d444b9401e7e34aee2 (commit)
       via  ec295b50426e78639526d197b95e80125533ad19 (commit)
       via  530ee237aa6dcf3202c434019eac71602aac3b73 (commit)
      from  e53fc4d8cdc62cfec235f7d030be4d8dfe3cb4a7 (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 3777aedaa6b570da2a0ba6d444b9401e7e34aee2
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 25 17:14:15 2012 -0500

    [master] remove the file generated by unittest
    
    remove file generated by src/bin/auth/tests/command_unittest.cc
    
    to fix distcheck build

commit ec295b50426e78639526d197b95e80125533ad19
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 25 13:14:46 2012 -0500

    [master] the datasrc.spec file is generated so use builddir

commit 530ee237aa6dcf3202c434019eac71602aac3b73
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 25 12:53:49 2012 -0500

    [master] make sure src/bin/auth/tests/testdata is in dist tarball

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

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

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 624530a..90137f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1018,6 +1018,7 @@ AC_CONFIG_FILES([Makefile
                  src/bin/msgq/tests/Makefile
                  src/bin/auth/Makefile
                  src/bin/auth/tests/Makefile
+                 src/bin/auth/tests/testdata/Makefile
                  src/bin/auth/benchmarks/Makefile
                  src/bin/ddns/Makefile
                  src/bin/ddns/tests/Makefile
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index c6b199a..602c1d6 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = testdata .
+
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
@@ -8,7 +10,7 @@ AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
 AM_CPPFLAGS += -DTEST_OWN_DATA_DIR=\"$(abs_top_srcdir)/src/bin/auth/tests/testdata\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
 AM_CPPFLAGS += -DDSRC_DIR=\"$(abs_top_builddir)/src/lib/datasrc\"
-AM_CPPFLAGS += -DPLUGIN_DATA_PATH=\"$(abs_top_srcdir)/src/bin/cfgmgr/plugins\"
+AM_CPPFLAGS += -DPLUGIN_DATA_PATH=\"$(abs_top_builddir)/src/bin/cfgmgr/plugins\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
@@ -21,6 +23,7 @@ AM_CPPFLAGS += -DUSE_STATIC_LINK=1
 endif
 
 CLEANFILES = *.gcno *.gcda
+CLEANFILES += $(abs_top_builddir)/src/lib/testutils/testdata/does-not-exist.sqlite3
 
 TESTS_ENVIRONMENT = \
         $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)



More information about the bind10-changes mailing list