[2480] distcheck fixes: using builddir where necessary

diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 1c384a604e750e7c49496fa12ecfb58b9b5f5023..f4742ffe43231cacd11d198af5c6119abf4ce1f7 100644 (file)
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -275,7 +275,7 @@ public:
         nsec3_name_(NULL)
     {
         RRCollator collator(boost::bind(&MockZoneFinder::loadRRset, this, _1));
-        MasterLoader loader(TEST_OWN_DATA_DIR "/example-nsec3.zone",
+        MasterLoader loader(TEST_OWN_DATA_BUILDDIR "/example-nsec3.zone",
                             origin_, rrclass_,
                             MasterLoaderCallbacks::getNullCallbacks(),
                             collator.getCallback());
@@ -859,15 +859,15 @@ protected:
                                     "[{\"type\": \"MasterFiles\","
                                     "  \"cache-enable\": true, "
                                     "  \"params\": {\"example.com\": \"" +
-                                    string(TEST_OWN_DATA_DIR
+                                    string(TEST_OWN_DATA_BUILDDIR
                                            "/example-nsec3.zone") +
                                     "\"}}]"), true);
             list_ = new_list;
             break;
         case SQLITE3:
-            ASSERT_EQ(0, std::system(INSTALL_PROG " -c " TEST_OWN_DATA_DIR
+            ASSERT_EQ(0, std::system(INSTALL_PROG " -c " TEST_OWN_DATA_BUILDDIR
                                      "/example-nsec3.sqlite3 "
-                                     TEST_OWN_DATA_DIR
+                                     TEST_OWN_DATA_BUILDDIR
                                      "/example-nsec3.sqlite3.copied"));
             new_list.reset(new ConfigurableClientList(RRClass::IN()));
             new_list->configure(isc::data::Element::fromJSON(
@@ -875,7 +875,7 @@ protected:
                                     "  \"cache-enable\": false, "
                                     "  \"cache-zones\": [], "
                                     "  \"params\": {\"database_file\": \"" +
-                                    string(TEST_OWN_DATA_DIR
+                                    string(TEST_OWN_DATA_BUILDDIR
                                            "/example-nsec3.sqlite3.copied") +
                                     "\"}}]"), true);
 

diff --git a/src/bin/auth/tests/testdata/Makefile.am b/src/bin/auth/tests/testdata/Makefile.am
index a8b752a1e60db584dde865f8e734f80ee832b393..c5655c56c4fb8f0e167e9854beb430e00c298d46 100644 (file)
--- a/src/bin/auth/tests/testdata/Makefile.am
+++ b/src/bin/auth/tests/testdata/Makefile.am
@@ -1,6 +1,6 @@
 CLEANFILES = *.wire *.copied
 CLEANFILES += example-base.zone example-nsec3-inc.zone
-CLEANFILES += example-base.sqlite3 example-nsec3.sqlite3       
+CLEANFILES += example-base.sqlite3 example-nsec3.sqlite3
 
 BUILT_SOURCES = badExampleQuery_fromWire.wire examplequery_fromWire.wire
 BUILT_SOURCES += iqueryresponse_fromWire.wire multiquestion_fromWire.wire