From: Michal 'vorner' Vaner Date: Thu, 17 Jan 2013 15:47:36 +0000 (+0100) Subject: Fix generation of test files X-Git-Tag: bind10-1.0.0-rc-release~96 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdc99366fe025e5175e4a6e2c189e3d5ae1125f7;p=thirdparty%2Fkea.git 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. --- diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am index 36a3c6826d..d1bde4d1ce 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