[llvm-commits] [llvm] r146294 - /llvm/trunk/unittests/Support/Path.cpp

[NAKAMURA Takumi]

Author: chapuni
Date: Fri Dec  9 17:20:03 2011
New Revision: 146294

URL: http://llvm.org/viewvc/llvm-project?rev=146294&view=rev
Log:
unittests/Support/Path.cpp: [recursive_directory_iterator] Work around for end iterator.

FIXME: It should be more robust.

Modified:
    llvm/trunk/unittests/Support/Path.cpp

Modified: llvm/trunk/unittests/Support/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/Path.cpp?rev=146294&r1=146293&r2=146294&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/Path.cpp (original)
+++ llvm/trunk/unittests/Support/Path.cpp Fri Dec  9 17:20:03 2011
@@ -241,8 +241,11 @@
   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()));