From: Francis Dupont <fdupont@isc.org>
Date: Sat, 13 Jun 2015 09:19:16 +0000 (+0200)
Subject: [3732a] Cleaned b10-config* from testdata
X-Git-Tag: trac3830_base~3^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=393db3293554723ef2cbfa57d2acb36b39707cab;p=thirdparty%2Fkea.git

[3732a] Cleaned b10-config* from testdata
---

diff --git a/src/lib/config/tests/testdata/.gitignore b/src/lib/config/tests/testdata/.gitignore
deleted file mode 100644
index 1c672810a3..0000000000
--- a/src/lib/config/tests/testdata/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/b10-config.db
diff --git a/src/lib/config/tests/testdata/Makefile.am b/src/lib/config/tests/testdata/Makefile.am
index 9b383d6539..b9ffb7b8e6 100644
--- a/src/lib/config/tests/testdata/Makefile.am
+++ b/src/lib/config/tests/testdata/Makefile.am
@@ -1,17 +1,3 @@
-CLEANFILES = b10-config.db
-
-BUILT_SOURCES = b10-config.db
-
-# cfgmgr_test (under lib/python) will override b10-config.db, so we make a
-# writable copy in the builddir.
-b10-config.db: b10-config.db.master
-	cp $(srcdir)/b10-config.db.master $@
-
-EXTRA_DIST =  b10-config-bad1.db
-EXTRA_DIST += b10-config-bad2.db
-EXTRA_DIST += b10-config-bad3.db
-EXTRA_DIST += b10-config-bad4.db
-EXTRA_DIST += b10-config.db.master #.db will be auto-generated
 EXTRA_DIST += data22_1.data
 EXTRA_DIST += data22_2.data
 EXTRA_DIST += data22_3.data
diff --git a/src/lib/config/tests/testdata/b10-config-bad1.db b/src/lib/config/tests/testdata/b10-config-bad1.db
deleted file mode 100644
index e7904035e8..0000000000
--- a/src/lib/config/tests/testdata/b10-config-bad1.db
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 0}
diff --git a/src/lib/config/tests/testdata/b10-config-bad2.db b/src/lib/config/tests/testdata/b10-config-bad2.db
deleted file mode 100644
index fa2749a23f..0000000000
--- a/src/lib/config/tests/testdata/b10-config-bad2.db
+++ /dev/null
@@ -1 +0,0 @@
-{'version':
diff --git a/src/lib/config/tests/testdata/b10-config-bad3.db b/src/lib/config/tests/testdata/b10-config-bad3.db
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/lib/config/tests/testdata/b10-config-bad4.db b/src/lib/config/tests/testdata/b10-config-bad4.db
deleted file mode 100644
index 92efee5ebf..0000000000
--- a/src/lib/config/tests/testdata/b10-config-bad4.db
+++ /dev/null
@@ -1 +0,0 @@
-{'version': 2}
diff --git a/src/lib/config/tests/testdata/b10-config.db.master b/src/lib/config/tests/testdata/b10-config.db.master
deleted file mode 100644
index d6f1873b6e..0000000000
--- a/src/lib/config/tests/testdata/b10-config.db.master
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 2, "TestModule": {"test": 125}}