BIND 10 trac1704_2, updated. 60c3dcef1055d54231708188639056248258e716 [1704] Delete test lockfiles when done

[BIND 10 source code commits]

The branch, trac1704_2 has been updated
       via  60c3dcef1055d54231708188639056248258e716 (commit)
       via  d6859a67235140aeb14a2224198b85e4d65ed71d (commit)
       via  162e15111002d1e857222eb309018818b637fbad (commit)
      from  1f12f3cd5bc0b3b39545680c4dd772303c62d43f (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 60c3dcef1055d54231708188639056248258e716
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed May 30 18:26:47 2012 +0530

    [1704] Delete test lockfiles when done

commit d6859a67235140aeb14a2224198b85e4d65ed71d
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed May 30 18:22:35 2012 +0530

    [1704] Change env variable used in tests for lockfiles

commit 162e15111002d1e857222eb309018818b637fbad
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed May 30 18:18:32 2012 +0530

    [1704] Change task name of object

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

Summary of changes:
 .../util/tests/interprocess_sync_file_unittest.cc  |   11 ++++++++++-
 src/lib/util/tests/run_unittests.cc                |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/tests/interprocess_sync_file_unittest.cc b/src/lib/util/tests/interprocess_sync_file_unittest.cc
index bf398df..3b15037 100644
--- a/src/lib/util/tests/interprocess_sync_file_unittest.cc
+++ b/src/lib/util/tests/interprocess_sync_file_unittest.cc
@@ -14,6 +14,7 @@
 
 #include "util/interprocess_sync_file.h"
 #include <gtest/gtest.h>
+#include <unistd.h>
 
 using namespace std;
 
@@ -94,6 +95,8 @@ TEST(InterprocessSyncFileTest, TestLock) {
   }
 
   EXPECT_TRUE(locker.unlock());
+
+  EXPECT_EQ (0, unlink("" TEST_DATA_TOPBUILDDIR "/test_lockfile"));
 }
 
 TEST(InterprocessSyncFileTest, TestMultipleFilesDirect) {
@@ -108,10 +111,13 @@ TEST(InterprocessSyncFileTest, TestMultipleFilesDirect) {
   EXPECT_TRUE(locker2.unlock());
 
   EXPECT_TRUE(locker.unlock());
+
+  EXPECT_EQ (0, unlink("" TEST_DATA_TOPBUILDDIR "/test1_lockfile"));
+  EXPECT_EQ (0, unlink("" TEST_DATA_TOPBUILDDIR "/test2_lockfile"));
 }
 
 TEST(InterprocessSyncFileTest, TestMultipleFilesForked) {
-  InterprocessSyncFile sync("test");
+  InterprocessSyncFile sync("test1");
   InterprocessSyncLocker locker(sync);
 
   EXPECT_TRUE(locker.lock());
@@ -147,6 +153,9 @@ TEST(InterprocessSyncFileTest, TestMultipleFilesForked) {
   }
 
   EXPECT_TRUE(locker.unlock());
+
+  EXPECT_EQ (0, unlink("" TEST_DATA_TOPBUILDDIR "/test1_lockfile"));
+  EXPECT_EQ (0, unlink("" TEST_DATA_TOPBUILDDIR "/test2_lockfile"));
 }
 }
 
diff --git a/src/lib/util/tests/run_unittests.cc b/src/lib/util/tests/run_unittests.cc
index a5d8b44..8789a9c 100644
--- a/src/lib/util/tests/run_unittests.cc
+++ b/src/lib/util/tests/run_unittests.cc
@@ -20,6 +20,6 @@ int
 main(int argc, char* argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
 
-    setenv("B10_FROM_BUILD", TEST_DATA_TOPBUILDDIR, 1);
+    setenv("B10_LOCKFILE_DIR_FROM_BUILD", TEST_DATA_TOPBUILDDIR, 1);
     return (isc::util::unittests::run_all());
 }