BIND 10 master, updated. bdc99366fe025e5175e4a6e2c189e3d5ae1125f7 Fix generation of test files

[BIND 10 source code commits]

The branch, master has been updated
       via  bdc99366fe025e5175e4a6e2c189e3d5ae1125f7 (commit)
      from  eda46b3f2aa8742c7ee7798383d59b401a07bc0f (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 bdc99366fe025e5175e4a6e2c189e3d5ae1125f7
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jan 17 16:47:36 2013 +0100

    Fix generation of test files
    
    Don't write to the same file at two different rules. That led to running
    the two rules in parallel, writing there at the same time, confusing the
    script that loaded it just after that.

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

Summary of changes:
 src/bin/auth/tests/Makefile.am |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 36a3c68..d1bde4d 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -99,18 +99,17 @@ example_nsec3_inc.cc: $(srcdir)/testdata/example-nsec3-inc.zone
 	$(PYTHON) $(srcdir)/gen-query-testdata.py \
 		$(srcdir)/testdata/example-nsec3-inc.zone example_nsec3_inc.cc
 
-testdata/example-base.sqlite3: testdata/example-base.zone
+testdata/example-common-inc.zone: $(srcdir)/testdata/example-common-inc-template.zone
 	$(top_srcdir)/install-sh -c \
 		$(srcdir)/testdata/example-common-inc-template.zone \
 		testdata/example-common-inc.zone
+
+testdata/example-base.sqlite3: testdata/example-base.zone testdata/example-common-inc.zone
 	$(SHELL) $(top_builddir)/src/bin/loadzone/run_loadzone.sh \
 		-c "{\"database_file\": \"$(builddir)/testdata/example-base.sqlite3\"}" \
 		example.com testdata/example-base.zone
 
-testdata/example-nsec3.sqlite3: testdata/example-nsec3.zone
-	$(top_srcdir)/install-sh -c \
-		$(srcdir)/testdata/example-common-inc-template.zone \
-		testdata/example-common-inc.zone
+testdata/example-nsec3.sqlite3: testdata/example-nsec3.zone testdata/example-common-inc.zone
 	$(SHELL) $(top_builddir)/src/bin/loadzone/run_loadzone.sh \
 		-c "{\"database_file\": \"$(builddir)/testdata/example-nsec3.sqlite3\"}" \
 		example.com testdata/example-nsec3.zone