From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Fri, 9 Dec 2011 23:20:03 +0000 (+0000)
Subject: unittests/Support/Path.cpp: [recursive_directory_iterator] Work around for end iterator.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52ee230f6e06c4ec38b1953e1182d22431b88ddb;p=oota-llvm.git

unittests/Support/Path.cpp: [recursive_directory_iterator] Work around for end iterator.

FIXME: It should be more robust.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146294 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp
index 51c62f25d66..c791184c837 100644
--- a/unittests/Support/Path.cpp
+++ b/unittests/Support/Path.cpp
@@ -241,8 +241,11 @@ TEST_F(FileSystemTest, DirectoryIteration) {
   for (fs::recursive_directory_iterator i(Twine(TestDirectory)
          + "/recursive", ec), e; i != e; i.increment(ec)){
     ASSERT_NO_ERROR(ec);
-    if (path::filename(i->path()) == "p1")
+    if (path::filename(i->path()) == "p1") {
       i.pop();
+      // FIXME: recursive_directory_iterator should be more robust.
+      if (i == e) break;
+    }
     if (path::filename(i->path()) == "dontlookhere")
       i.no_push();
     visited.push_back(path::filename(i->path()));