]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Fix generation of test files
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>
Thu, 17 Jan 2013 15:47:36 +0000 (16:47 +0100)
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>
Thu, 17 Jan 2013 15:47:36 +0000 (16:47 +0100)
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.

src/bin/auth/tests/Makefile.am

index 36a3c6826d6c0c813cf9d4f25c78d4bb6b387762..d1bde4d1ce472d8cd97443d67e96b72b16697689 100644 (file)
@@ -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