[clang-tools-extra] r228695 - Fixed module-map-checker to recurse umbrella dirs when collecting headers.

[John Thompson]

Author: jtsoftware
Date: Tue Feb 10 08:58:07 2015
New Revision: 228695

URL: http://llvm.org/viewvc/llvm-project?rev=228695&view=rev
Log:
Fixed module-map-checker to recurse umbrella dirs when collecting headers.

Modified:
    clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp

Modified: clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp?rev=228695&r1=228694&r2=228695&view=diff
==============================================================================
--- clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp (original)
+++ clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp Tue Feb 10 08:58:07 2015
@@ -374,9 +374,12 @@ bool ModuleMapChecker::collectUmbrellaHe
     std::string File(I->path());
     I->status(Status);
     sys::fs::file_type Type = Status.type();
-    // If the file is a directory, ignore the name.
-    if (Type == sys::fs::file_type::directory_file)
+    // If the file is a directory, ignore the name and recurse.
+    if (Type == sys::fs::file_type::directory_file) {
+      if (!collectUmbrellaHeaders(File))
+        return false;
       continue;
+    }
     // If the file does not have a common header extension, ignore it.
     if (!isHeader(File))
       continue;