BIND 10 master, updated. e23c4b1e90ba1127a5b7eaef4add6f3b68fbc6fa [master] This uses generated test script, so run from the builddir.

[BIND 10 source code commits]

The branch, master has been updated
       via  e23c4b1e90ba1127a5b7eaef4add6f3b68fbc6fa (commit)
       via  a83e29a881af14dc61b366024e25f5ca68244220 (commit)
      from  bf0a9b3576da038ee53bd49360fe3bd8b01189fd (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 e23c4b1e90ba1127a5b7eaef4add6f3b68fbc6fa
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Apr 11 19:17:07 2011 -0500

    [master] This uses generated test script, so run from the builddir.
    
    This uses generated test script, so run from the builddir.
    But now this is slightly different from other test makefiles.

commit a83e29a881af14dc61b366024e25f5ca68244220
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Apr 11 19:12:32 2011 -0500

    [master] add -I for builddir to find generated spec_config.h.
    
    Add -I flag for builddir to find generated spec_config.h.
    
    Also remove the ../spec_config.h target. It didn't work as-is
    since it referenced file in the wrong directory. Instead of fixing
    this I decided to remove. In normal build, the previous directory
    does build it first. In the case of attempting to build specific
    directories first, doesn't work yet due to other problems already
    (like missing dns components).
    
    This was noticed in a failed distcheck.

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

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

-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 22c9c02..882f7fd 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -1,4 +1,5 @@
 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
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
 AM_CPPFLAGS += $(BOOST_INCLUDES)
@@ -16,10 +17,6 @@ CLEANFILES = *.gcno *.gcda
 
 TESTS =
 if HAVE_GTEST
-../spec_config.h: ../spec_config.h.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
-
-CLEANFILES += ../spec_config.h
 
 BUILT_SOURCES = ../spec_config.h
 TESTS += run_unittests
diff --git a/src/bin/bind10/tests/Makefile.am b/src/bin/bind10/tests/Makefile.am
index d05d977..34d809a 100644
--- a/src/bin/bind10/tests/Makefile.am
+++ b/src/bin/bind10/tests/Makefile.am
@@ -1,5 +1,6 @@
 PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 #PYTESTS = args_test.py bind10_test.py
+# NOTE: this has a generated test found in the builddir
 PYTESTS = bind10_test.py
 EXTRA_DIST = $(PYTESTS)
 
@@ -14,5 +15,5 @@ endif
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
 	BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket \
-		$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
+		$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
 	done