BIND 10 master, updated. cb4d9b014ea7d80efadfbdbfe2d1ab1dbde68bc1 [master] perfdhcp test creates template files in a local folder.

[BIND 10 source code commits]

The branch, master has been updated
       via  cb4d9b014ea7d80efadfbdbfe2d1ab1dbde68bc1 (commit)
      from  5c9dba4001ebbb432a7313a91cb3bc7b440bb396 (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 cb4d9b014ea7d80efadfbdbfe2d1ab1dbde68bc1
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Dec 7 21:36:42 2012 +0100

    [master] perfdhcp test creates template files in a local folder.
    
    The test used to create template files in a testdata folder without write
    permissions. That caused 'make distcheck' errors. This regression had
    been introduced with the ticket #2479. Okayed on jabber.

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

Summary of changes:
 tests/tools/perfdhcp/tests/Makefile.am             |    3 +++
 .../tools/perfdhcp/tests/test_control_unittest.cc  |   10 +++++-----
 tests/tools/perfdhcp/tests/testdata/Makefile.am    |    4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index be67481..aa4c0cf 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/tests/tools/perfdhcp/tests/Makefile.am
@@ -10,6 +10,9 @@ AM_LDFLAGS = -static
 endif
 
 CLEANFILES = *.gcno *.gcda
+# The test[1-5].hex are created by the TestControl.PacketTemplates
+# unit tests and have to be removed.
+CLEANFILES += test1.hex test2.hex test3.hex test4.hex test5.hex
 
 TESTS_ENVIRONMENT = \
         $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
diff --git a/tests/tools/perfdhcp/tests/test_control_unittest.cc b/tests/tools/perfdhcp/tests/test_control_unittest.cc
index 176644c..6c27731 100644
--- a/tests/tools/perfdhcp/tests/test_control_unittest.cc
+++ b/tests/tools/perfdhcp/tests/test_control_unittest.cc
@@ -993,9 +993,9 @@ TEST_F(TestControlTest, Packet6Exchange) {
 
 TEST_F(TestControlTest, PacketTemplates) {
     std::vector<uint8_t> template1(256);
-    std::string file1(getFullPath("test1.hex"));
+    std::string file1("test1.hex");
     std::vector<uint8_t> template2(233);
-    std::string file2(getFullPath("test2.hex"));
+    std::string file2("test2.hex");
     for (int i = 0; i < template1.size(); ++i) {
         template1[i] = static_cast<uint8_t>(random() % 256);
     }
@@ -1023,7 +1023,7 @@ TEST_F(TestControlTest, PacketTemplates) {
     EXPECT_TRUE(std::equal(template2.begin(), template2.end(), buf2.begin()));
 
     // Try to read template file with odd number of digits.
-    std::string file3(getFullPath("test3.hex"));
+    std::string file3("test3.hex");
     // Size of the file is 2 times larger than binary data size and it is always
     // even number. Substracting 1 makes file size odd.
     ASSERT_TRUE(createTemplateFile(file3, template1, template1.size() * 2 - 1));
@@ -1033,7 +1033,7 @@ TEST_F(TestControlTest, PacketTemplates) {
     EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange);
 
     // Try to read empty file.
-    std::string file4(getFullPath("test4.hex"));
+    std::string file4("test4.hex");
     ASSERT_TRUE(createTemplateFile(file4, template2, 0));
     ASSERT_NO_THROW(
         processCmdLine("perfdhcp -l 127.0.0.1 -T " + file4 + " all")
@@ -1041,7 +1041,7 @@ TEST_F(TestControlTest, PacketTemplates) {
     EXPECT_THROW(tc.initPacketTemplates(), isc::OutOfRange);
 
     // Try reading file with non hexadecimal characters.
-    std::string file5(getFullPath("test5.hex"));
+    std::string file5("test5.hex");
     ASSERT_TRUE(createTemplateFile(file5, template1, template1.size() * 2, true));
     ASSERT_NO_THROW(
         processCmdLine("perfdhcp -l 127.0.0.1 -T " + file5 + " all")
diff --git a/tests/tools/perfdhcp/tests/testdata/Makefile.am b/tests/tools/perfdhcp/tests/testdata/Makefile.am
index bbd9a73..2de1643 100644
--- a/tests/tools/perfdhcp/tests/testdata/Makefile.am
+++ b/tests/tools/perfdhcp/tests/testdata/Makefile.am
@@ -1,8 +1,4 @@
 SUBDIRS = .
 
-# The test[1-5].hex are created by the TestControl.PacketTemplates
-# unit tests and have to be removed.
-CLEANFILES = test1.hex test2.hex test3.hex test4.hex test5.hex
-
 EXTRA_DIST = discover-example.hex request4-example.hex
 EXTRA_DIST += solicit-example.hex request6-example.hex