Commit b2e71a86 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

merged trac #344: use the common path for test data in lib/config


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3104 e5f2f494-b856-4b98-b285-d166d9295462
parents 3b93ec6c ebed7a43
......@@ -495,7 +495,7 @@ AC_CONFIG_FILES([Makefile
src/lib/python/isc/notify/tests/Makefile
src/lib/config/Makefile
src/lib/config/tests/Makefile
src/lib/config/testdata/Makefile
src/lib/config/tests/testdata/Makefile
src/lib/dns/Makefile
src/lib/dns/tests/Makefile
src/lib/dns/tests/testdata/Makefile
......
SUBDIRS = . testdata tests
SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
......@@ -8,45 +8,3 @@ lib_LTLIBRARIES = libcfgclient.la
libcfgclient_la_SOURCES = config_data.h config_data.cc module_spec.h module_spec.cc ccsession.cc ccsession.h
CLEANFILES = *.gcno *.gcda
EXTRA_DIST = testdata/b10-config-bad1.db
EXTRA_DIST += testdata/b10-config-bad2.db
EXTRA_DIST += testdata/b10-config-bad3.db
EXTRA_DIST += testdata/b10-config-bad4.db
EXTRA_DIST += testdata/b10-config.db.master #.db will be auto-generated
EXTRA_DIST += testdata/data22_1.data
EXTRA_DIST += testdata/data22_2.data
EXTRA_DIST += testdata/data22_3.data
EXTRA_DIST += testdata/data22_4.data
EXTRA_DIST += testdata/data22_5.data
EXTRA_DIST += testdata/data22_6.data
EXTRA_DIST += testdata/data22_7.data
EXTRA_DIST += testdata/data22_8.data
EXTRA_DIST += testdata/spec1.spec
EXTRA_DIST += testdata/spec2.spec
EXTRA_DIST += testdata/spec3.spec
EXTRA_DIST += testdata/spec4.spec
EXTRA_DIST += testdata/spec5.spec
EXTRA_DIST += testdata/spec6.spec
EXTRA_DIST += testdata/spec7.spec
EXTRA_DIST += testdata/spec8.spec
EXTRA_DIST += testdata/spec9.spec
EXTRA_DIST += testdata/spec10.spec
EXTRA_DIST += testdata/spec11.spec
EXTRA_DIST += testdata/spec12.spec
EXTRA_DIST += testdata/spec13.spec
EXTRA_DIST += testdata/spec14.spec
EXTRA_DIST += testdata/spec15.spec
EXTRA_DIST += testdata/spec16.spec
EXTRA_DIST += testdata/spec17.spec
EXTRA_DIST += testdata/spec18.spec
EXTRA_DIST += testdata/spec19.spec
EXTRA_DIST += testdata/spec20.spec
EXTRA_DIST += testdata/spec21.spec
EXTRA_DIST += testdata/spec22.spec
EXTRA_DIST += testdata/spec23.spec
EXTRA_DIST += testdata/spec24.spec
EXTRA_DIST += testdata/spec25.spec
EXTRA_DIST += testdata/spec26.spec
EXTRA_DIST += testdata/spec27.spec
EXTRA_DIST += testdata/spec28.spec
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 $@
SUBDIRS = testdata .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CXXFLAGS = $(B10_CXXFLAGS)
......
......@@ -12,4 +12,4 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#define TEST_DATA_PATH "@abs_srcdir@/../testdata"
#define TEST_DATA_PATH "@abs_srcdir@/testdata"
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
EXTRA_DIST += data22_4.data
EXTRA_DIST += data22_5.data
EXTRA_DIST += data22_6.data
EXTRA_DIST += data22_7.data
EXTRA_DIST += data22_8.data
EXTRA_DIST += spec1.spec
EXTRA_DIST += spec2.spec
EXTRA_DIST += spec3.spec
EXTRA_DIST += spec4.spec
EXTRA_DIST += spec5.spec
EXTRA_DIST += spec6.spec
EXTRA_DIST += spec7.spec
EXTRA_DIST += spec8.spec
EXTRA_DIST += spec9.spec
EXTRA_DIST += spec10.spec
EXTRA_DIST += spec11.spec
EXTRA_DIST += spec12.spec
EXTRA_DIST += spec13.spec
EXTRA_DIST += spec14.spec
EXTRA_DIST += spec15.spec
EXTRA_DIST += spec16.spec
EXTRA_DIST += spec17.spec
EXTRA_DIST += spec18.spec
EXTRA_DIST += spec19.spec
EXTRA_DIST += spec20.spec
EXTRA_DIST += spec21.spec
EXTRA_DIST += spec22.spec
EXTRA_DIST += spec23.spec
EXTRA_DIST += spec24.spec
EXTRA_DIST += spec25.spec
EXTRA_DIST += spec26.spec
EXTRA_DIST += spec27.spec
EXTRA_DIST += spec28.spec
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment