[cfe-commits] r149196 - in /cfe/trunk/test/Modules: Inputs/subdir/ Inputs/subdir/module.map Inputs/subdir/subdir.h on-demand-build.m

[Douglas Gregor]

Author: dgregor
Date: Sun Jan 29 10:43:46 2012
New Revision: 149196

URL: http://llvm.org/viewvc/llvm-project?rev=149196&view=rev
Log:
Test module lookup within a subdirectory of a normal include directory.

Added:
    cfe/trunk/test/Modules/Inputs/subdir/
    cfe/trunk/test/Modules/Inputs/subdir/module.map
    cfe/trunk/test/Modules/Inputs/subdir/subdir.h   (with props)
Modified:
    cfe/trunk/test/Modules/on-demand-build.m

Added: cfe/trunk/test/Modules/Inputs/subdir/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/subdir/module.map?rev=149196&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/subdir/module.map (added)
+++ cfe/trunk/test/Modules/Inputs/subdir/module.map Sun Jan 29 10:43:46 2012
@@ -0,0 +1,3 @@
+module subdir {
+  header "subdir.h"
+}

Added: cfe/trunk/test/Modules/Inputs/subdir/subdir.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/subdir/subdir.h?rev=149196&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/subdir/subdir.h (added)
+++ cfe/trunk/test/Modules/Inputs/subdir/subdir.h Sun Jan 29 10:43:46 2012
@@ -0,0 +1 @@
+const char *getSubdir();

Propchange: cfe/trunk/test/Modules/Inputs/subdir/subdir.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cfe/trunk/test/Modules/Inputs/subdir/subdir.h
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cfe/trunk/test/Modules/Inputs/subdir/subdir.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cfe/trunk/test/Modules/on-demand-build.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/on-demand-build.m?rev=149196&r1=149195&r2=149196&view=diff
==============================================================================
--- cfe/trunk/test/Modules/on-demand-build.m (original)
+++ cfe/trunk/test/Modules/on-demand-build.m Sun Jan 29 10:43:46 2012
@@ -1,7 +1,7 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -verify %s
-// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -x objective-c++ -fmodule-cache-path %t -F %S/Inputs -verify %s
-// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -verify %s
+// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
+// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -x objective-c++ -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
+// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
 #define FOO
 @import Module;
 @interface OtherClass
@@ -22,3 +22,6 @@
 #  error MODULE_SUBFRAMEWORK_H should be hidden
 #endif
 
+ at import subdir;
+
+const char *getSubdirTest() { return getSubdir(); }