BIND 10 master, updated. a3c0c4cffe519c5d70185ec989fe707102a71836 [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  a3c0c4cffe519c5d70185ec989fe707102a71836 (commit)
       via  d119c3155e617e120c69abebcf8d22e500dcffca (commit)
      from  c80a7b8a53dc04e66b55431e2d4c637618293dae (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 a3c0c4cffe519c5d70185ec989fe707102a71836
Merge: d119c31 c80a7b8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Oct 6 15:57:20 2011 -0700

    [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit d119c3155e617e120c69abebcf8d22e500dcffca
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Oct 6 15:56:56 2011 -0700

    [master] a quickhack fix to discheck failure in dhcp6/tests.
    okayed on jabber

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

Summary of changes:
 src/bin/dhcp6/tests/Makefile.am           |    4 +++-
 src/bin/dhcp6/tests/iface_mgr_unittest.cc |    6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 873b21f..ae9d8e3 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -29,9 +29,11 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
-AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/dhcp6/tests\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 
+CLEANFILES = $(builddir)/interfaces.txt
+
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 if USE_STATIC_LINK
diff --git a/src/bin/dhcp6/tests/iface_mgr_unittest.cc b/src/bin/dhcp6/tests/iface_mgr_unittest.cc
index c8301eb..a726511 100644
--- a/src/bin/dhcp6/tests/iface_mgr_unittest.cc
+++ b/src/bin/dhcp6/tests/iface_mgr_unittest.cc
@@ -29,6 +29,8 @@ using namespace isc;
 using namespace isc::asiolink;
 
 namespace {
+const char* const INTERFACE_FILE = TEST_DATA_BUILDDIR "/interfaces.txt";
+
 class NakedIfaceMgr: public IfaceMgr {
     // "naked" Interface Manager, exposes internal fields
 public:
@@ -114,7 +116,7 @@ TEST_F(IfaceMgrTest, detectIfaces) {
     // test detects that interfaces can be detected
     // there is no code for that now, but interfaces are
     // read from file
-    fstream fakeifaces("interfaces.txt", ios::out|ios::trunc);
+    fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
     fakeifaces << "eth0 fe80::1234";
     fakeifaces.close();
 
@@ -210,7 +212,7 @@ TEST_F(IfaceMgrTest, DISABLED_sendReceive) {
     // testing socket operation in a portable way is tricky
     // without interface detection implemented
 
-    fstream fakeifaces("interfaces.txt", ios::out|ios::trunc);
+    fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
     fakeifaces << "lo ::1";
     fakeifaces.close();