diff options
Diffstat (limited to 'clang/test')
8 files changed, 55 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/ImportNameInDir.h b/clang/test/Modules/Inputs/ImportNameInDir.h new file mode 100644 index 00000000000..ae7b1a0fb27 --- /dev/null +++ b/clang/test/Modules/Inputs/ImportNameInDir.h @@ -0,0 +1,4 @@ +#import <NameInDir/NameInDir.h> + +// Don't crash. +#undef NAME_IN_DIR diff --git a/clang/test/Modules/Inputs/NameInDir.framework/Headers/NameInDir.h b/clang/test/Modules/Inputs/NameInDir.framework/Headers/NameInDir.h new file mode 100644 index 00000000000..bea23914858 --- /dev/null +++ b/clang/test/Modules/Inputs/NameInDir.framework/Headers/NameInDir.h @@ -0,0 +1,2 @@ +// NameInDir.h +#define NAME_IN_DIR 1 diff --git a/clang/test/Modules/Inputs/NameInDir.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/NameInDir.framework/Modules/module.modulemap new file mode 100644 index 00000000000..48e1c56749f --- /dev/null +++ b/clang/test/Modules/Inputs/NameInDir.framework/Modules/module.modulemap @@ -0,0 +1,5 @@ +framework module NameInModMap { + umbrella header "NameInDir.h" + export * + module * { export * } +} diff --git a/clang/test/Modules/Inputs/NameInDir2.framework/Headers/NameInDir2.h b/clang/test/Modules/Inputs/NameInDir2.framework/Headers/NameInDir2.h new file mode 100644 index 00000000000..6dc3eea149e --- /dev/null +++ b/clang/test/Modules/Inputs/NameInDir2.framework/Headers/NameInDir2.h @@ -0,0 +1 @@ +// NameInDir2.h diff --git a/clang/test/Modules/Inputs/NameInDir2.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/NameInDir2.framework/Modules/module.modulemap new file mode 100644 index 00000000000..24f15f8e846 --- /dev/null +++ b/clang/test/Modules/Inputs/NameInDir2.framework/Modules/module.modulemap @@ -0,0 +1,5 @@ +framework module NameInDir2 { + umbrella header "NameInDir2.h" + export * + module * { export * } +} diff --git a/clang/test/Modules/Inputs/NameInDirInferred.framework/Headers/NameInDirInferred.h b/clang/test/Modules/Inputs/NameInDirInferred.framework/Headers/NameInDirInferred.h new file mode 100644 index 00000000000..c0b12e6f945 --- /dev/null +++ b/clang/test/Modules/Inputs/NameInDirInferred.framework/Headers/NameInDirInferred.h @@ -0,0 +1 @@ +// NameInDirInferred.h diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map index b9c8e72cfa9..ffaa53e18e2 100644 --- a/clang/test/Modules/Inputs/module.map +++ b/clang/test/Modules/Inputs/module.map @@ -332,3 +332,7 @@ module DebugModule { header "DebugModule.h" } +module ImportNameInDir { + header "ImportNameInDir.h" + export * +} diff --git a/clang/test/Modules/framework-name.m b/clang/test/Modules/framework-name.m new file mode 100644 index 00000000000..a63e206073d --- /dev/null +++ b/clang/test/Modules/framework-name.m @@ -0,0 +1,33 @@ +// REQUIRES: shell +// RUN: rm -rf %t.mcp %t +// RUN: mkdir -p %t +// RUN: ln -s %S/Inputs/NameInDir2.framework %t/NameInImport.framework +// RUN: ln -s %S/Inputs/NameInDirInferred.framework %t/NameInImportInferred.framework +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t.mcp -fimplicit-module-maps -I %S/Inputs -F %S/Inputs -F %t -Wauto-import -verify %s + +// Sanity check that we won't somehow find non-canonical module names or +// modules where we shouldn't search the framework. +// RUN: echo '@import NameInModMap' | not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -F %S/Inputs -F %t -Wauto-import -x objective-c - 2>&1 | FileCheck %s +// RUN: echo '@import NameInDir' | not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -F %S/Inputs -F %t -Wauto-import -x objective-c - 2>&1 | FileCheck %s +// RUN: echo '@import NameInImport' | not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -F %S/Inputs -F %t -Wauto-import -x objective-c - 2>&1 | FileCheck %s +// RUN: echo '@import NameInImportInferred' | not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -F %S/Inputs -F %t -Wauto-import -x objective-c - 2>&1 | FileCheck %s +// CHECK: module '{{.*}}' not found + +// FIXME: We might want to someday lock down framework modules so that these +// name mismatches are disallowed. However, as long as we *don't* prevent them +// it's important that they map correctly to module imports. + +// The module map name doesn't match the directory name. +#import <NameInDir/NameInDir.h> // expected-warning {{import of module 'NameInModMap'}} + +// The name in the import doesn't match the module name. +#import <NameInImport/NameInDir2.h> // expected-warning {{import of module 'NameInDir2'}} +@import NameInDir2; // OK + +// The name in the import doesn't match the module name (inferred framework module). +#import <NameInImportInferred/NameInDirInferred.h> // expected-warning {{import of module 'NameInDirInferred'}} + +@import ImportNameInDir; +#ifdef NAME_IN_DIR +#error NAME_IN_DIR should be undef'd +#endif |
