From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 4 Dec 2012 19:29:20 +0000 (+0100)
Subject: [2479] Moved perfdhcp/template folder to perfdhcp/tests/testdata.
X-Git-Tag: bind10-1.0.0-beta-release~21^2~11^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf7313f6bb3fd3ace97b50509a4208864c4c4ea;p=thirdparty%2Fkea.git

[2479] Moved perfdhcp/template folder to perfdhcp/tests/testdata.
---

diff --git a/configure.ac b/configure.ac
index 636f8aa959..feeb9a9248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1308,7 +1308,7 @@ AC_CONFIG_FILES([Makefile
                  tests/tools/badpacket/tests/Makefile
                  tests/tools/perfdhcp/Makefile
                  tests/tools/perfdhcp/tests/Makefile
-                 tests/tools/perfdhcp/templates/Makefile
+                 tests/tools/perfdhcp/tests/testdata/Makefile
                  dns++.pc
                ])
 AC_OUTPUT([doc/version.ent
diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am
index 08a21a4c2d..c4b82b5d48 100644
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/tests/tools/perfdhcp/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . tests templates
+SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index 54602aff4b..4879d57ab7 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/tests/tools/perfdhcp/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = . testdata
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
diff --git a/tests/tools/perfdhcp/templates/.gitignore b/tests/tools/perfdhcp/tests/testdata/.gitignore
similarity index 100%
rename from tests/tools/perfdhcp/templates/.gitignore
rename to tests/tools/perfdhcp/tests/testdata/.gitignore
diff --git a/tests/tools/perfdhcp/templates/Makefile.am b/tests/tools/perfdhcp/tests/testdata/Makefile.am
similarity index 100%
rename from tests/tools/perfdhcp/templates/Makefile.am
rename to tests/tools/perfdhcp/tests/testdata/Makefile.am
diff --git a/tests/tools/perfdhcp/templates/discover-example.hex b/tests/tools/perfdhcp/tests/testdata/discover-example.hex
similarity index 100%
rename from tests/tools/perfdhcp/templates/discover-example.hex
rename to tests/tools/perfdhcp/tests/testdata/discover-example.hex
diff --git a/tests/tools/perfdhcp/templates/request4-example.hex b/tests/tools/perfdhcp/tests/testdata/request4-example.hex
similarity index 100%
rename from tests/tools/perfdhcp/templates/request4-example.hex
rename to tests/tools/perfdhcp/tests/testdata/request4-example.hex
diff --git a/tests/tools/perfdhcp/templates/request6-example.hex b/tests/tools/perfdhcp/tests/testdata/request6-example.hex
similarity index 100%
rename from tests/tools/perfdhcp/templates/request6-example.hex
rename to tests/tools/perfdhcp/tests/testdata/request6-example.hex
diff --git a/tests/tools/perfdhcp/templates/solicit-example.hex b/tests/tools/perfdhcp/tests/testdata/solicit-example.hex
similarity index 100%
rename from tests/tools/perfdhcp/templates/solicit-example.hex
rename to tests/tools/perfdhcp/tests/testdata/solicit-example.hex