From 1fe28e3baa9666a984b567e8f48322f6a44d6c5f Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 17 Jun 2015 22:13:13 +0200 Subject: [PATCH] [3732b] Removed no longer used b10-config files --- src/lib/config/tests/testdata/.gitignore | 1 - src/lib/config/tests/testdata/Makefile.am | 16 +--------------- src/lib/config/tests/testdata/b10-config-bad1.db | 1 - src/lib/config/tests/testdata/b10-config-bad2.db | 1 - src/lib/config/tests/testdata/b10-config-bad3.db | 0 src/lib/config/tests/testdata/b10-config-bad4.db | 1 - .../config/tests/testdata/b10-config.db.master | 1 - 7 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/lib/config/tests/testdata/.gitignore delete mode 100644 src/lib/config/tests/testdata/b10-config-bad1.db delete mode 100644 src/lib/config/tests/testdata/b10-config-bad2.db delete mode 100644 src/lib/config/tests/testdata/b10-config-bad3.db delete mode 100644 src/lib/config/tests/testdata/b10-config-bad4.db delete mode 100644 src/lib/config/tests/testdata/b10-config.db.master 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..641a142632 100644 --- a/src/lib/config/tests/testdata/Makefile.am +++ b/src/lib/config/tests/testdata/Makefile.am @@ -1,18 +1,4 @@ -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_1.data EXTRA_DIST += data22_2.data EXTRA_DIST += data22_3.data EXTRA_DIST += data22_4.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}} -- 2.47.3