OSDN Git Service

unittests/SupportTests: Fix test. pop modifies the current entry, thus the
authorMichael J. Spencer <bigcheesegs@gmail.com>
Fri, 9 Dec 2011 01:14:41 +0000 (01:14 +0000)
committerMichael J. Spencer <bigcheesegs@gmail.com>
Fri, 9 Dec 2011 01:14:41 +0000 (01:14 +0000)
dontlookhere check must be after it.

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

unittests/Support/Path.cpp

index 9099b72..51c62f2 100644 (file)
@@ -241,13 +241,10 @@ 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()) == "dontlookhere")
-      i.no_push();
-    outs() << "pre-pop: " << path::filename(i->path()) << "\n";
     if (path::filename(i->path()) == "p1")
       i.pop();
-    outs() << "post-pop: " << path::filename(i->path()) << "\n";
-    outs().flush();
+    if (path::filename(i->path()) == "dontlookhere")
+      i.no_push();
     visited.push_back(path::filename(i->path()));
   }
   v_t::const_iterator a0 = std::find(visited.begin(), visited.end(), "a0");