BIND 10 trac2377, updated. ad9807ad75f8b76413de4ab0478cff9611a2817a [2377] Fix paths to test files

[BIND 10 source code commits]

The branch, trac2377 has been updated
       via  ad9807ad75f8b76413de4ab0478cff9611a2817a (commit)
      from  0f6b84e5523df12f5017ef7615bd0bb25359cc5f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad9807ad75f8b76413de4ab0478cff9611a2817a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Dec 4 11:09:18 2012 +0100

    [2377] Fix paths to test files

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/tests/master_loader_unittest.cc |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index e99cd24..b359cf8 100644
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -69,9 +69,7 @@ public:
     void setLoader(const char* file, const Name& origin, const RRClass rrclass,
                    const MasterLoader::Options options)
     {
-        loader_.reset(new MasterLoader((string(TEST_DATA_SRCDIR "/") +
-                                        file).c_str(), origin, rrclass,
-                                       callbacks_,
+        loader_.reset(new MasterLoader(file, origin, rrclass, callbacks_,
                                        boost::bind(&MasterLoaderTest::addRRset,
                                                    this, _1, _2, _3, _4, _5),
                                        options));
@@ -117,8 +115,8 @@ public:
 // Test simple loading. The zone file contains no tricky things, and nothing is
 // omitted. No RRset contains more than one RR Also no errors or warnings.
 TEST_F(MasterLoaderTest, basicLoad) {
-    setLoader("example.org", Name("example.org."), RRClass::IN(),
-              MasterLoader::MANY_ERRORS);
+    setLoader(TEST_DATA_SRCDIR "/example.org", Name("example.org."),
+              RRClass::IN(), MasterLoader::MANY_ERRORS);
 
     loader_->load();
 
@@ -133,8 +131,8 @@ TEST_F(MasterLoaderTest, basicLoad) {
 
 // Try loading data incrementally.
 TEST_F(MasterLoaderTest, incrementalLoad) {
-    setLoader("example.org", Name("example.org."), RRClass::IN(),
-              MasterLoader::MANY_ERRORS);
+    setLoader(TEST_DATA_SRCDIR "/example.org", Name("example.org."),
+              RRClass::IN(), MasterLoader::MANY_ERRORS);
 
     EXPECT_FALSE(loader_->loadIncremental(2));