Browse Source

[1792] moved rwtest.sqlite3 under lib/testutils so that it can be shared.

it's going to be used in subsequent auth tests.
JINMEI Tatuya 13 years ago
parent
commit
08d1332164

+ 0 - 1
src/lib/datasrc/tests/Makefile.am

@@ -106,7 +106,6 @@ EXTRA_DIST += testdata/mkbrokendb.c
 EXTRA_DIST += testdata/root.zone
 EXTRA_DIST += testdata/rrset_toWire1
 EXTRA_DIST += testdata/rrset_toWire2
-EXTRA_DIST += testdata/rwtest.sqlite3
 EXTRA_DIST += testdata/sql1.example.com.signed
 EXTRA_DIST += testdata/sql2.example.com.signed
 EXTRA_DIST += testdata/test-root.sqlite3

+ 1 - 1
src/lib/datasrc/tests/database_unittest.cc

@@ -1090,7 +1090,7 @@ public:
         // probably move this to some specialized templated method specific
         // to SQLite3 (or for even a longer term we should add an API to
         // purge the diffs table).
-        const char* const install_cmd = INSTALL_PROG " " TEST_DATA_DIR
+        const char* const install_cmd = INSTALL_PROG " " TEST_DATA_COMMONDIR
             "/rwtest.sqlite3 " TEST_DATA_BUILDDIR
             "/rwtest.sqlite3.copied";
         if (system(install_cmd) != 0) {

+ 1 - 1
src/lib/datasrc/tests/test_client.cc

@@ -66,7 +66,7 @@ createSQLite3Client(RRClass zclass, const Name& zname,
     // We always begin with an empty template SQLite3 DB file and install
     // the zone data from the zone file to ensure both cases have the
     // same test data.
-    const char* const install_cmd_prefix = INSTALL_PROG " " TEST_DATA_DIR
+    const char* const install_cmd_prefix = INSTALL_PROG " " TEST_DATA_COMMONDIR
         "/rwtest.sqlite3 ";
     const string install_cmd = string(install_cmd_prefix) + db_file;
     if (system(install_cmd.c_str()) != 0) {

+ 1 - 0
src/lib/testutils/testdata/Makefile.am

@@ -27,6 +27,7 @@ EXTRA_DIST += rfc5155-example.zone.signed
 
 EXTRA_DIST += example.com
 EXTRA_DIST += example.sqlite3
+EXTRA_DIST += rwtest.sqlite3	# SQLite3 DB file as a template data source
 
 EXTRA_DIST += test1.zone.in
 EXTRA_DIST += test1-new.zone.in

+ 0 - 0
src/lib/datasrc/tests/testdata/rwtest.sqlite3


BIN
src/lib/testutils/testdata/auth_test.sqlite3.copied


BIN
src/lib/testutils/testdata/rwtest.sqlite3