diff --git a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp index d87f11f3aac85..8dc7877c17849 100644 --- a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp +++ b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp @@ -1917,14 +1917,14 @@ TEST_F(SymbolCollectorTest, UndefOfModuleMacro) { #undef X )cpp"; TU.AdditionalFiles["foo.h"] = "#define X 1"; - TU.AdditionalFiles["module.modulemap"] = R"cpp( + TU.AdditionalFiles["module.map"] = R"cpp( module foo { header "foo.h" export * } )cpp"; TU.ExtraArgs.push_back("-fmodules"); - TU.ExtraArgs.push_back("-fmodule-map-file=" + testPath("module.modulemap")); + TU.ExtraArgs.push_back("-fmodule-map-file=" + testPath("module.map")); TU.OverlayRealFileSystemForModules = true; TU.build(); diff --git a/clang-tools-extra/docs/modularize.rst b/clang-tools-extra/docs/modularize.rst index 64ca8c99d4e8e..9dde467ec3084 100644 --- a/clang-tools-extra/docs/modularize.rst +++ b/clang-tools-extra/docs/modularize.rst @@ -20,7 +20,7 @@ map. :program:`modularize` also has an assistant mode option for generating a module map file based on the provided header list. The generated file is a functional module map that can be used as a starting point for a -module.modulemap file. +module.map file. Getting Started =============== diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp index 937c3a875ce33..4b95711813d9e 100644 --- a/clang-tools-extra/modularize/Modularize.cpp +++ b/clang-tools-extra/modularize/Modularize.cpp @@ -51,20 +51,20 @@ // to the header list file directory. Use -prefix to specify a // different directory. // -module-map-path=(module map) -// Skip the checks, and instead act as a module.modulemap generation +// Skip the checks, and instead act as a module.map generation // assistant, generating a module map file based on the header list. // An optional "-root-module=(rootName)" argument can specify a root -// module to be created in the generated module.modulemap file. Note -// that you will likely need to edit this file to suit the needs of -// your headers. +// module to be created in the generated module.map file. Note that +// you will likely need to edit this file to suit the needs of your +// headers. // -problem-files-list=(problem files list file name) // For use only with module map assistant. Input list of files that // have problems with respect to modules. These will still be // included in the generated module map, but will be marked as // "excluded" headers. // -root-module=(root module name) -// Specifies a root module to be created in the generated -// module.modulemap file. +// Specifies a root module to be created in the generated module.map +// file. // -block-check-header-list-only // Only warn if #include directives are inside extern or namespace // blocks if the included header is in the header list. diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp index f3689a204e0f8..3bf761c0a22c3 100644 --- a/clang-tools-extra/modularize/ModularizeUtilities.cpp +++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp @@ -103,10 +103,10 @@ std::error_code ModularizeUtilities::loadAllHeaderListsAndDependencies() { // Do coverage checks. // For each loaded module map, do header coverage check. -// Starting from the directory of the module.modulemap file, +// Starting from the directory of the module.map file, // Find all header files, optionally looking only at files // covered by the include path options, and compare against -// the headers referenced by the module.modulemap file. +// the headers referenced by the module.map file. // Display warnings for unaccounted-for header files. // Returns 0 if there were no errors or warnings, 1 if there // were warnings, 2 if any other problem, such as a bad diff --git a/clang-tools-extra/modularize/ModularizeUtilities.h b/clang-tools-extra/modularize/ModularizeUtilities.h index 64675022dad76..6da15e42f1f1e 100644 --- a/clang-tools-extra/modularize/ModularizeUtilities.h +++ b/clang-tools-extra/modularize/ModularizeUtilities.h @@ -89,10 +89,10 @@ class ModularizeUtilities { /// Do coverage checks. /// For each loaded module map, do header coverage check. - /// Starting from the directory of the module.modulemap file, + /// Starting from the directory of the module.map file, /// Find all header files, optionally looking only at files /// covered by the include path options, and compare against - /// the headers referenced by the module.modulemap file. + /// the headers referenced by the module.map file. /// Display warnings for unaccounted-for header files. /// \param IncludePaths The include paths to check for files. /// (Note that other directories above these paths are ignored. diff --git a/clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap b/clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap index 64180adf5beb3..fbb8e7db4d10c 100644 --- a/clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap +++ b/clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap @@ -1,4 +1,4 @@ -// module.modulemap +// module.map module Level1A { header "Level1A.h" diff --git a/clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap b/clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap index 39af7d5dcf366..d2b0957b76e1c 100644 --- a/clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap +++ b/clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap @@ -1,4 +1,4 @@ -// module.modulemap +// module.map module Level1A { header "Includes1/Level1A.h" diff --git a/clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap b/clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap index 2b8b23054a019..dbe0bb8507cf0 100644 --- a/clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap +++ b/clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap @@ -1,4 +1,4 @@ -// module.modulemap +// module.map module Level1A { header "Level1A.h" diff --git a/clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap b/clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap index 9acb4923f9ac3..daa06fca78d26 100644 --- a/clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap +++ b/clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap @@ -1,4 +1,4 @@ -// module.modulemap +// module.map module Level1A { header "Level1A.h" diff --git a/clang-tools-extra/test/pp-trace/Inputs/module.modulemap b/clang-tools-extra/test/pp-trace/Inputs/module.map similarity index 84% rename from clang-tools-extra/test/pp-trace/Inputs/module.modulemap rename to clang-tools-extra/test/pp-trace/Inputs/module.map index f16bbc6e2e05b..31f33c5bb1490 100644 --- a/clang-tools-extra/test/pp-trace/Inputs/module.modulemap +++ b/clang-tools-extra/test/pp-trace/Inputs/module.map @@ -1,4 +1,4 @@ -// module.modulemap +// module.map module Level1A { header "Level1A.h" diff --git a/clang/include/clang-c/BuildSystem.h b/clang/include/clang-c/BuildSystem.h index 57e16af20a700..296e61247cef5 100644 --- a/clang/include/clang-c/BuildSystem.h +++ b/clang/include/clang-c/BuildSystem.h @@ -95,7 +95,7 @@ CINDEX_LINKAGE void clang_free(void *buffer); CINDEX_LINKAGE void clang_VirtualFileOverlay_dispose(CXVirtualFileOverlay); /** - * Object encapsulating information about a module.modulemap file. + * Object encapsulating information about a module.map file. */ typedef struct CXModuleMapDescriptorImpl *CXModuleMapDescriptor; @@ -109,7 +109,7 @@ CINDEX_LINKAGE CXModuleMapDescriptor clang_ModuleMapDescriptor_create(unsigned options); /** - * Sets the framework module name that the module.modulemap describes. + * Sets the framework module name that the module.map describes. * \returns 0 for success, non-zero to indicate an error. */ CINDEX_LINKAGE enum CXErrorCode @@ -117,7 +117,7 @@ clang_ModuleMapDescriptor_setFrameworkModuleName(CXModuleMapDescriptor, const char *name); /** - * Sets the umbrella header name that the module.modulemap describes. + * Sets the umbrella header name that the module.map describes. * \returns 0 for success, non-zero to indicate an error. */ CINDEX_LINKAGE enum CXErrorCode diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 217d41c59e905..9f853bad3c605 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -39,7 +39,6 @@ def : DiagGroup<"auto-import">; def FrameworkHdrQuotedInclude : DiagGroup<"quoted-include-in-framework-header">; def FrameworkIncludePrivateFromPublic : DiagGroup<"framework-include-private-from-public">; -def DeprecatedModuleDotMap : DiagGroup<"deprecated-module-dot-map">; def FrameworkHdrAtImport : DiagGroup<"atimport-in-framework-header">; def CXX14BinaryLiteral : DiagGroup<"c++14-binary-literal">; def CXXPre14CompatBinaryLiteral : DiagGroup<"c++98-c++11-compat-binary-literal">; diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td index 7dc5935feba9f..011bd4e8b5244 100644 --- a/clang/include/clang/Basic/DiagnosticLexKinds.td +++ b/clang/include/clang/Basic/DiagnosticLexKinds.td @@ -869,9 +869,6 @@ def warn_quoted_include_in_framework_header : Warning< def warn_framework_include_private_from_public : Warning< "public framework header includes private framework header '%0'" >, InGroup, DefaultIgnore; -def warn_deprecated_module_dot_map : Warning< - "'%0' as a module map name is deprecated, rename it to %select{module.modulemap|module.private.modulemap}1%select{| in the 'Modules' directory of the framework}2">, - InGroup; def remark_pp_include_directive_modular_translation : Remark< "treating #%select{include|import|include_next|__include_macros}0 as an " diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index eb26891a1e43d..b8baf9016a889 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -1610,9 +1610,7 @@ bool HeaderSearch::findUsableModuleForFrameworkHeader( } static const FileEntry *getPrivateModuleMap(const FileEntry *File, - FileManager &FileMgr, - DirectoryEntryRef Dir, - DiagnosticsEngine &Diags) { + FileManager &FileMgr) { StringRef Filename = llvm::sys::path::filename(File->getName()); SmallString<128> PrivateFilename(File->getDir()->getName()); if (Filename == "module.map") @@ -1621,12 +1619,8 @@ static const FileEntry *getPrivateModuleMap(const FileEntry *File, llvm::sys::path::append(PrivateFilename, "module.private.modulemap"); else return nullptr; - if (auto PMMFile = FileMgr.getFile(PrivateFilename)) { - if (Filename == "module.map") - Diags.Report(diag::warn_deprecated_module_dot_map) - << PrivateFilename << 1 << Dir.getName().endswith(".framework"); - return *PMMFile; - } + if (auto File = FileMgr.getFile(PrivateFilename)) + return *File; return nullptr; } @@ -1697,8 +1691,7 @@ HeaderSearch::loadModuleMapFileImpl(const FileEntry *File, bool IsSystem, } // Try to load a corresponding private module map. - if (const FileEntry *PMMFile = - getPrivateModuleMap(File, FileMgr, Dir, Diags)) { + if (const FileEntry *PMMFile = getPrivateModuleMap(File, FileMgr)) { if (ModMap.parseModuleMapFile(PMMFile, IsSystem, Dir)) { LoadedModuleMaps[File] = false; return LMM_InvalidModuleMap; @@ -1722,14 +1715,11 @@ HeaderSearch::lookupModuleMapFile(const DirectoryEntry *Dir, bool IsFramework) { if (auto F = FileMgr.getFile(ModuleMapFileName)) return *F; - // Continue to allow module.map, but warn it's deprecated. + // Continue to allow module.map ModuleMapFileName = Dir->getName(); llvm::sys::path::append(ModuleMapFileName, "module.map"); - if (auto F = FileMgr.getFile(ModuleMapFileName)) { - Diags.Report(diag::warn_deprecated_module_dot_map) - << ModuleMapFileName << 0 << IsFramework; + if (auto F = FileMgr.getFile(ModuleMapFileName)) return *F; - } // For frameworks, allow to have a private module map with a preferred // spelling when a public module map is absent. diff --git a/clang/test/ARCMT/Inputs/module.modulemap b/clang/test/ARCMT/Inputs/module.map similarity index 100% rename from clang/test/ARCMT/Inputs/module.modulemap rename to clang/test/ARCMT/Inputs/module.map diff --git a/clang/test/Index/Inputs/Frameworks/module.modulemap b/clang/test/Index/Inputs/Frameworks/module.map similarity index 100% rename from clang/test/Index/Inputs/Frameworks/module.modulemap rename to clang/test/Index/Inputs/Frameworks/module.map diff --git a/clang/test/Index/Inputs/Headers/module.modulemap b/clang/test/Index/Inputs/Headers/module.map similarity index 100% rename from clang/test/Index/Inputs/Headers/module.modulemap rename to clang/test/Index/Inputs/Headers/module.map diff --git a/clang/test/Index/Inputs/Headers/nested/module.modulemap b/clang/test/Index/Inputs/Headers/nested/module.map similarity index 100% rename from clang/test/Index/Inputs/Headers/nested/module.modulemap rename to clang/test/Index/Inputs/Headers/nested/module.map diff --git a/clang/test/Index/Inputs/module.modulemap b/clang/test/Index/Inputs/module.map similarity index 100% rename from clang/test/Index/Inputs/module.modulemap rename to clang/test/Index/Inputs/module.map diff --git a/clang/test/Index/Inputs/vfsoverlay.yaml b/clang/test/Index/Inputs/vfsoverlay.yaml index 3e9718b4c4314..95b00bef7d0e4 100644 --- a/clang/test/Index/Inputs/vfsoverlay.yaml +++ b/clang/test/Index/Inputs/vfsoverlay.yaml @@ -3,8 +3,8 @@ 'roots': [ { 'name': 'OUT_DIR', 'type': 'directory', 'contents': [ - { 'name': 'module.modulemap', 'type': 'file', - 'external-contents': 'INPUT_DIR/module.modulemap' + { 'name': 'module.map', 'type': 'file', + 'external-contents': 'INPUT_DIR/module.map' }, { 'name': 'ModuleNeedsVFS.h', 'type': 'file', 'external-contents': 'INPUT_DIR/module_needs_vfs.h' diff --git a/clang/test/Modules/Inputs/Conflicts/module.modulemap b/clang/test/Modules/Inputs/Conflicts/module.map similarity index 100% rename from clang/test/Modules/Inputs/Conflicts/module.modulemap rename to clang/test/Modules/Inputs/Conflicts/module.map diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map similarity index 100% rename from clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.modulemap rename to clang/test/Modules/Inputs/DependsOnModule.framework/module.map diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.private.modulemap b/clang/test/Modules/Inputs/DependsOnModule.framework/module_private.map similarity index 100% rename from clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.private.modulemap rename to clang/test/Modules/Inputs/DependsOnModule.framework/module_private.map diff --git a/clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/module.map similarity index 100% rename from clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/Modules/module.modulemap rename to clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/module.map diff --git a/clang/test/Modules/Inputs/Modified/module.modulemap b/clang/test/Modules/Inputs/Modified/module.map similarity index 100% rename from clang/test/Modules/Inputs/Modified/module.modulemap rename to clang/test/Modules/Inputs/Modified/module.map diff --git a/clang/test/Modules/Inputs/ModuleDiags/module.modulemap b/clang/test/Modules/Inputs/ModuleDiags/module.map similarity index 100% rename from clang/test/Modules/Inputs/ModuleDiags/module.modulemap rename to clang/test/Modules/Inputs/ModuleDiags/module.map diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/a.h b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/a.h deleted file mode 100644 index d571c6e4f799f..0000000000000 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/a.h +++ /dev/null @@ -1 +0,0 @@ -void will_be_found1(void); diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module.map b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module.map deleted file mode 100644 index ef46443cedc92..0000000000000 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module.map +++ /dev/null @@ -1,3 +0,0 @@ -module module_map { - header "a.h" -} diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module_private.map b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module_private.map deleted file mode 100644 index d542172a1235e..0000000000000 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module_private.map +++ /dev/null @@ -1,3 +0,0 @@ -module module_map.Private { - header "private.h" -} diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/private.h b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/private.h deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/Headers/a.h b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/Headers/a.h deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/PrivateHeaders/private.h b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/PrivateHeaders/private.h deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module.map b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module.map deleted file mode 100644 index f30545f8a88cd..0000000000000 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module.map +++ /dev/null @@ -1,3 +0,0 @@ -framework module Module_Map_F { - header "a.h" -} diff --git a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module_private.map b/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module_private.map deleted file mode 100644 index 0b3b5a78b8741..0000000000000 --- a/clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module_private.map +++ /dev/null @@ -1,3 +0,0 @@ -explicit framework module Module_Map_F.Private { - header "private.h" -} diff --git a/clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/NoUmbrella.framework/module.map similarity index 100% rename from clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.modulemap rename to clang/test/Modules/Inputs/NoUmbrella.framework/module.map diff --git a/clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.private.modulemap b/clang/test/Modules/Inputs/NoUmbrella.framework/module_private.map similarity index 100% rename from clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.private.modulemap rename to clang/test/Modules/Inputs/NoUmbrella.framework/module_private.map diff --git a/clang/test/Modules/Inputs/StdDef/module.modulemap b/clang/test/Modules/Inputs/StdDef/module.map similarity index 100% rename from clang/test/Modules/Inputs/StdDef/module.modulemap rename to clang/test/Modules/Inputs/StdDef/module.map diff --git a/clang/test/Modules/Inputs/System/usr/include/module.modulemap b/clang/test/Modules/Inputs/System/usr/include/module.map similarity index 100% rename from clang/test/Modules/Inputs/System/usr/include/module.modulemap rename to clang/test/Modules/Inputs/System/usr/include/module.map diff --git a/clang/test/Modules/Inputs/UseAfterFree/module.modulemap b/clang/test/Modules/Inputs/UseAfterFree/module.map similarity index 100% rename from clang/test/Modules/Inputs/UseAfterFree/module.modulemap rename to clang/test/Modules/Inputs/UseAfterFree/module.map diff --git a/clang/test/Modules/Inputs/UseAfterFree/module.private.modulemap b/clang/test/Modules/Inputs/UseAfterFree/module_private.map similarity index 100% rename from clang/test/Modules/Inputs/UseAfterFree/module.private.modulemap rename to clang/test/Modules/Inputs/UseAfterFree/module_private.map diff --git a/clang/test/Modules/Inputs/crash-recovery/usr/include/module.modulemap b/clang/test/Modules/Inputs/crash-recovery/usr/include/module.map similarity index 100% rename from clang/test/Modules/Inputs/crash-recovery/usr/include/module.modulemap rename to clang/test/Modules/Inputs/crash-recovery/usr/include/module.map diff --git a/clang/test/Modules/Inputs/declare-use/module.modulemap b/clang/test/Modules/Inputs/declare-use/module.map similarity index 100% rename from clang/test/Modules/Inputs/declare-use/module.modulemap rename to clang/test/Modules/Inputs/declare-use/module.map diff --git a/clang/test/Modules/Inputs/elsewhere/module.modulemap b/clang/test/Modules/Inputs/elsewhere/module.map similarity index 100% rename from clang/test/Modules/Inputs/elsewhere/module.modulemap rename to clang/test/Modules/Inputs/elsewhere/module.map diff --git a/clang/test/Modules/Inputs/exclude-header/module.modulemap b/clang/test/Modules/Inputs/exclude-header/module.map similarity index 100% rename from clang/test/Modules/Inputs/exclude-header/module.modulemap rename to clang/test/Modules/Inputs/exclude-header/module.map diff --git a/clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module.private.modulemap b/clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module_private.map similarity index 100% rename from clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module.private.modulemap rename to clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module_private.map diff --git a/clang/test/Modules/Inputs/include-relative/module.modulemap b/clang/test/Modules/Inputs/include-relative/module.map similarity index 100% rename from clang/test/Modules/Inputs/include-relative/module.modulemap rename to clang/test/Modules/Inputs/include-relative/module.map diff --git a/clang/test/Modules/Inputs/lookup-assert-protocol/module.modulemap b/clang/test/Modules/Inputs/lookup-assert-protocol/module.map similarity index 100% rename from clang/test/Modules/Inputs/lookup-assert-protocol/module.modulemap rename to clang/test/Modules/Inputs/lookup-assert-protocol/module.map diff --git a/clang/test/Modules/Inputs/lookup-assert/module.modulemap b/clang/test/Modules/Inputs/lookup-assert/module.map similarity index 100% rename from clang/test/Modules/Inputs/lookup-assert/module.modulemap rename to clang/test/Modules/Inputs/lookup-assert/module.map diff --git a/clang/test/Modules/Inputs/macro-undef-through-pch/module.modulemap b/clang/test/Modules/Inputs/macro-undef-through-pch/module.map similarity index 100% rename from clang/test/Modules/Inputs/macro-undef-through-pch/module.modulemap rename to clang/test/Modules/Inputs/macro-undef-through-pch/module.map diff --git a/clang/test/Modules/Inputs/malformed/module.modulemap b/clang/test/Modules/Inputs/malformed/module.map similarity index 100% rename from clang/test/Modules/Inputs/malformed/module.modulemap rename to clang/test/Modules/Inputs/malformed/module.map diff --git a/clang/test/Modules/Inputs/module.modulemap b/clang/test/Modules/Inputs/module.map similarity index 100% rename from clang/test/Modules/Inputs/module.modulemap rename to clang/test/Modules/Inputs/module.map diff --git a/clang/test/Modules/Inputs/ms-enums/module.modulemap b/clang/test/Modules/Inputs/ms-enums/module.map similarity index 100% rename from clang/test/Modules/Inputs/ms-enums/module.modulemap rename to clang/test/Modules/Inputs/ms-enums/module.map diff --git a/clang/test/Modules/Inputs/normal-module-map/Umbrella/module.modulemap b/clang/test/Modules/Inputs/normal-module-map/Umbrella/module.map similarity index 100% rename from clang/test/Modules/Inputs/normal-module-map/Umbrella/module.modulemap rename to clang/test/Modules/Inputs/normal-module-map/Umbrella/module.map diff --git a/clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.modulemap b/clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.map similarity index 100% rename from clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.modulemap rename to clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.map diff --git a/clang/test/Modules/Inputs/normal-module-map/module.modulemap b/clang/test/Modules/Inputs/normal-module-map/module.map similarity index 100% rename from clang/test/Modules/Inputs/normal-module-map/module.modulemap rename to clang/test/Modules/Inputs/normal-module-map/module.map diff --git a/clang/test/Modules/Inputs/normal-module-map/nested/module.modulemap b/clang/test/Modules/Inputs/normal-module-map/nested/module.map similarity index 100% rename from clang/test/Modules/Inputs/normal-module-map/nested/module.modulemap rename to clang/test/Modules/Inputs/normal-module-map/nested/module.map diff --git a/clang/test/Modules/Inputs/objc-category-2/module.modulemap b/clang/test/Modules/Inputs/objc-category-2/module.map similarity index 100% rename from clang/test/Modules/Inputs/objc-category-2/module.modulemap rename to clang/test/Modules/Inputs/objc-category-2/module.map diff --git a/clang/test/Modules/Inputs/objc-category-3/module.modulemap b/clang/test/Modules/Inputs/objc-category-3/module.map similarity index 100% rename from clang/test/Modules/Inputs/objc-category-3/module.modulemap rename to clang/test/Modules/Inputs/objc-category-3/module.map diff --git a/clang/test/Modules/Inputs/objc-category/module.modulemap b/clang/test/Modules/Inputs/objc-category/module.map similarity index 100% rename from clang/test/Modules/Inputs/objc-category/module.modulemap rename to clang/test/Modules/Inputs/objc-category/module.map diff --git a/clang/test/Modules/Inputs/objc-hidden/System/module.modulemap b/clang/test/Modules/Inputs/objc-hidden/System/module.map similarity index 100% rename from clang/test/Modules/Inputs/objc-hidden/System/module.modulemap rename to clang/test/Modules/Inputs/objc-hidden/System/module.map diff --git a/clang/test/Modules/Inputs/odr/module.modulemap b/clang/test/Modules/Inputs/odr/module.map similarity index 100% rename from clang/test/Modules/Inputs/odr/module.modulemap rename to clang/test/Modules/Inputs/odr/module.map diff --git a/clang/test/Modules/Inputs/oldname/module.modulemap b/clang/test/Modules/Inputs/oldname/module.map similarity index 100% rename from clang/test/Modules/Inputs/oldname/module.modulemap rename to clang/test/Modules/Inputs/oldname/module.map diff --git a/clang/test/Modules/Inputs/pr19692/module.modulemap b/clang/test/Modules/Inputs/pr19692/module.map similarity index 100% rename from clang/test/Modules/Inputs/pr19692/module.modulemap rename to clang/test/Modules/Inputs/pr19692/module.map diff --git a/clang/test/Modules/Inputs/private/module.modulemap b/clang/test/Modules/Inputs/private/module.map similarity index 100% rename from clang/test/Modules/Inputs/private/module.modulemap rename to clang/test/Modules/Inputs/private/module.map diff --git a/clang/test/Modules/Inputs/private1/module.modulemap b/clang/test/Modules/Inputs/private1/module.map similarity index 100% rename from clang/test/Modules/Inputs/private1/module.modulemap rename to clang/test/Modules/Inputs/private1/module.map diff --git a/clang/test/Modules/Inputs/private2/module.modulemap b/clang/test/Modules/Inputs/private2/module.map similarity index 100% rename from clang/test/Modules/Inputs/private2/module.modulemap rename to clang/test/Modules/Inputs/private2/module.map diff --git a/clang/test/Modules/Inputs/redecls/module.modulemap b/clang/test/Modules/Inputs/redecls/module.map similarity index 100% rename from clang/test/Modules/Inputs/redecls/module.modulemap rename to clang/test/Modules/Inputs/redecls/module.map diff --git a/clang/test/Modules/Inputs/self-import-header/af.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/self-import-header/af.framework/module.map similarity index 100% rename from clang/test/Modules/Inputs/self-import-header/af.framework/Modules/module.modulemap rename to clang/test/Modules/Inputs/self-import-header/af.framework/module.map diff --git a/clang/test/Modules/Inputs/self-import-header/depend_builtin/module.modulemap b/clang/test/Modules/Inputs/self-import-header/depend_builtin/module.map similarity index 100% rename from clang/test/Modules/Inputs/self-import-header/depend_builtin/module.modulemap rename to clang/test/Modules/Inputs/self-import-header/depend_builtin/module.map diff --git a/clang/test/Modules/Inputs/string_names/module.modulemap b/clang/test/Modules/Inputs/string_names/module.map similarity index 100% rename from clang/test/Modules/Inputs/string_names/module.modulemap rename to clang/test/Modules/Inputs/string_names/module.map diff --git a/clang/test/Modules/Inputs/subdir/module.modulemap b/clang/test/Modules/Inputs/subdir/module.map similarity index 100% rename from clang/test/Modules/Inputs/subdir/module.modulemap rename to clang/test/Modules/Inputs/subdir/module.map diff --git a/clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.modulemap b/clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.map similarity index 100% rename from clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.modulemap rename to clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.map diff --git a/clang/test/Modules/Inputs/submodules/module.modulemap b/clang/test/Modules/Inputs/submodules/module.map similarity index 100% rename from clang/test/Modules/Inputs/submodules/module.modulemap rename to clang/test/Modules/Inputs/submodules/module.map diff --git a/clang/test/Modules/Inputs/system-out-of-date/module.modulemap b/clang/test/Modules/Inputs/system-out-of-date/module.map similarity index 100% rename from clang/test/Modules/Inputs/system-out-of-date/module.modulemap rename to clang/test/Modules/Inputs/system-out-of-date/module.map diff --git a/clang/test/Modules/Inputs/template-specialization-visibility/module.modulemap b/clang/test/Modules/Inputs/template-specialization-visibility/module.map similarity index 100% rename from clang/test/Modules/Inputs/template-specialization-visibility/module.modulemap rename to clang/test/Modules/Inputs/template-specialization-visibility/module.map diff --git a/clang/test/Modules/Inputs/thread-safety/module.modulemap b/clang/test/Modules/Inputs/thread-safety/module.map similarity index 100% rename from clang/test/Modules/Inputs/thread-safety/module.modulemap rename to clang/test/Modules/Inputs/thread-safety/module.map diff --git a/clang/test/Modules/Inputs/undefined-type-fixit/module.modulemap b/clang/test/Modules/Inputs/undefined-type-fixit/module.map similarity index 100% rename from clang/test/Modules/Inputs/undefined-type-fixit/module.modulemap rename to clang/test/Modules/Inputs/undefined-type-fixit/module.map diff --git a/clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.modulemap b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map similarity index 100% rename from clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.modulemap rename to clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map diff --git a/clang/test/Modules/Inputs/update-after-load/module.modulemap b/clang/test/Modules/Inputs/update-after-load/module.map similarity index 100% rename from clang/test/Modules/Inputs/update-after-load/module.modulemap rename to clang/test/Modules/Inputs/update-after-load/module.map diff --git a/clang/test/Modules/Inputs/wildcard-submodule-exports/module.modulemap b/clang/test/Modules/Inputs/wildcard-submodule-exports/module.map similarity index 100% rename from clang/test/Modules/Inputs/wildcard-submodule-exports/module.modulemap rename to clang/test/Modules/Inputs/wildcard-submodule-exports/module.map diff --git a/clang/test/Modules/concept_differ.cpp b/clang/test/Modules/concept_differ.cpp index 9c1d292f29274..23c7d4c5ecf9a 100644 --- a/clang/test/Modules/concept_differ.cpp +++ b/clang/test/Modules/concept_differ.cpp @@ -2,9 +2,9 @@ // RUN: mkdir %t // RUN: split-file %s %t // -// RUN: %clang_cc1 -x c++ -std=c++20 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%t/module.modulemap %t/foo.cpp -verify +// RUN: %clang_cc1 -x c++ -std=c++20 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%t/module.map %t/foo.cpp -verify -//--- module.modulemap +//--- module.map module "foo" { export * header "foo.h" diff --git a/clang/test/Modules/config_macros.m b/clang/test/Modules/config_macros.m index 15e2c16606ba2..dd071993809be 100644 --- a/clang/test/Modules/config_macros.m +++ b/clang/test/Modules/config_macros.m @@ -23,6 +23,6 @@ @import config; // expected-warning{{definition of configuration macro 'WANT_BAR' has no effect on the import of 'config'; pass '-DWANT_BAR=...' on the command line to configure the module}} // RUN: rm -rf %t -// RUN: %clang_cc1 -std=c99 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -DWANT_FOO=1 -emit-module -fmodule-name=config %S/Inputs/module.modulemap +// RUN: %clang_cc1 -std=c99 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -DWANT_FOO=1 -emit-module -fmodule-name=config %S/Inputs/module.map // RUN: %clang_cc1 -std=c99 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs -DWANT_FOO=1 %s -verify diff --git a/clang/test/Modules/crash-vfs-ivfsoverlay.m b/clang/test/Modules/crash-vfs-ivfsoverlay.m index 32489457d7362..d2d2ccbd2546b 100644 --- a/clang/test/Modules/crash-vfs-ivfsoverlay.m +++ b/clang/test/Modules/crash-vfs-ivfsoverlay.m @@ -41,5 +41,5 @@ // CHECKYAML: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", +// CHECKYAML-NEXT: 'name': "module.map", // CHECKYAML-NEXT: 'external-contents': "/[[OTHERPATH:.*]]/actual_module2.map" diff --git a/clang/test/Modules/crash-vfs-path-symlink-component.m b/clang/test/Modules/crash-vfs-path-symlink-component.m index a675759d2075f..e8b5848abfdd3 100644 --- a/clang/test/Modules/crash-vfs-path-symlink-component.m +++ b/clang/test/Modules/crash-vfs-path-symlink-component.m @@ -49,8 +49,8 @@ // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", -// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/i/usr/include/module.modulemap" +// CHECKYAML-NEXT: 'name': "module.map", +// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/i/usr/include/module.map" // CHECKYAML-NEXT: }, // Test that by using the previous generated YAML file clang is able to find the diff --git a/clang/test/Modules/crash-vfs-path-traversal.m b/clang/test/Modules/crash-vfs-path-traversal.m index 25e7d2175129e..198e1fc68cada 100644 --- a/clang/test/Modules/crash-vfs-path-traversal.m +++ b/clang/test/Modules/crash-vfs-path-traversal.m @@ -46,8 +46,8 @@ // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", -// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.modulemap" +// CHECKYAML-NEXT: 'name': "module.map", +// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.map" // CHECKYAML-NEXT: }, // Replace the paths in the YAML files with relative ".." traversals diff --git a/clang/test/Modules/crash-vfs-relative-incdir.m b/clang/test/Modules/crash-vfs-relative-incdir.m index c0407f776778b..e35c1e9fdb659 100644 --- a/clang/test/Modules/crash-vfs-relative-incdir.m +++ b/clang/test/Modules/crash-vfs-relative-incdir.m @@ -41,9 +41,9 @@ // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", +// CHECKYAML-NEXT: 'name': "module.map", // CHECKYAML-NOT: 'external-contents': "{{[^ ]*}}.cache -// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.modulemap" +// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.map" // CHECKYAML-NEXT: }, // Run the reproducer script - regular exit code is enough to test it works. diff --git a/clang/test/Modules/crash-vfs-relative-overlay.m b/clang/test/Modules/crash-vfs-relative-overlay.m index 7208654627be5..59cd8fd9c70da 100644 --- a/clang/test/Modules/crash-vfs-relative-overlay.m +++ b/clang/test/Modules/crash-vfs-relative-overlay.m @@ -44,9 +44,9 @@ // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", +// CHECKYAML-NEXT: 'name': "module.map", // CHECKYAML-NOT: 'external-contents': "{{[^ ]*}}.cache -// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.modulemap" +// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.map" // CHECKYAML-NEXT: }, // Test that reading the YAML file will yield the correct path after diff --git a/clang/test/Modules/crash-vfs-run-reproducer.m b/clang/test/Modules/crash-vfs-run-reproducer.m index fd861fed5a603..d43f7b5e4475d 100644 --- a/clang/test/Modules/crash-vfs-run-reproducer.m +++ b/clang/test/Modules/crash-vfs-run-reproducer.m @@ -41,9 +41,9 @@ // CHECKYAML-NEXT: 'contents': [ // CHECKYAML-NEXT: { // CHECKYAML-NEXT: 'type': 'file', -// CHECKYAML-NEXT: 'name': "module.modulemap", +// CHECKYAML-NEXT: 'name': "module.map", // CHECKYAML-NOT: 'external-contents': "{{[^ ]*}}.cache -// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.modulemap" +// CHECKYAML-NEXT: 'external-contents': "/[[PATH]]/Inputs/crash-recovery/usr/include/module.map" // CHECKYAML-NEXT: }, // Run the reproducer script - regular exit code is enough to test it works. diff --git a/clang/test/Modules/declare-use-compatible.cpp b/clang/test/Modules/declare-use-compatible.cpp index 75ef5b00508d4..a2e7f01c6c1d1 100644 --- a/clang/test/Modules/declare-use-compatible.cpp +++ b/clang/test/Modules/declare-use-compatible.cpp @@ -1,7 +1,7 @@ // Used module not built with -decluse. // RUN: rm -rf %t // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodule-name=XB -emit-module \ -// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.modulemap -o %t/b.pcm +// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \ // RUN: -fmodules-decluse \ // RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s @@ -10,14 +10,14 @@ // RUN: rm -rf %t // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodule-name=XB -emit-module \ // RUN: -fmodules-decluse \ -// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.modulemap -o %t/b.pcm +// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \ // RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s // // Used module not built with -decluse. // RUN: rm -rf %t // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodule-name=XB -emit-module \ -// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.modulemap -o %t/b.pcm +// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \ // RUN: -fmodules-strict-decluse \ // RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s @@ -26,7 +26,7 @@ // RUN: rm -rf %t // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodule-name=XB -emit-module \ // RUN: -fmodules-strict-decluse \ -// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.modulemap -o %t/b.pcm +// RUN: -I %S/Inputs/declare-use %S/Inputs/declare-use/module.map -o %t/b.pcm // RUN: %clang_cc1 -x c++ -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \ // RUN: -fmodule-file=%t/b.pcm -fmodule-name=XE -I %S/Inputs/declare-use %s diff --git a/clang/test/Modules/dependency-gen-pch.m b/clang/test/Modules/dependency-gen-pch.m index bdc226ffe33c8..589865e71d68a 100644 --- a/clang/test/Modules/dependency-gen-pch.m +++ b/clang/test/Modules/dependency-gen-pch.m @@ -6,7 +6,7 @@ // RUN: FileCheck %s < %t.d // CHECK: dependency-gen-pch.m.o // CHECK-NEXT: dependency-gen-pch.m -// CHECK-NEXT: Inputs{{.}}module.modulemap +// CHECK-NEXT: Inputs{{.}}module.map // CHECK-NEXT: diamond_top.pcm // CHECK-NEXT: Inputs{{.}}diamond_top.h diff --git a/clang/test/Modules/dependency-gen.m b/clang/test/Modules/dependency-gen.m index cdf170238d6f6..cb0a875956052 100644 --- a/clang/test/Modules/dependency-gen.m +++ b/clang/test/Modules/dependency-gen.m @@ -4,18 +4,18 @@ // RUN: %clang_cc1 -x objective-c -isystem %S/Inputs/System/usr/include -dependency-file %t.d.1 -MT %s.o -I %S/Inputs -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t-mcp %s // RUN: FileCheck %s < %t.d.1 // CHECK: dependency-gen.m -// CHECK: Inputs{{.}}module.modulemap +// CHECK: Inputs{{.}}module.map // CHECK: Inputs{{.}}diamond_top.h -// CHECK-NOT: usr{{.}}include{{.}}module.modulemap +// CHECK-NOT: usr{{.}}include{{.}}module.map // CHECK-NOT: stdint.h // RUN: %clang_cc1 -x objective-c -isystem %S/Inputs/System/usr/include -dependency-file %t.d.2 -MT %s.o -I %S/Inputs -sys-header-deps -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t-mcp %s // RUN: FileCheck %s -check-prefix=CHECK-SYS < %t.d.2 // CHECK-SYS: dependency-gen.m -// CHECK-SYS: Inputs{{.}}module.modulemap +// CHECK-SYS: Inputs{{.}}module.map // CHECK-SYS: Inputs{{.}}diamond_top.h -// CHECK-SYS: usr{{.}}include{{.}}module.modulemap +// CHECK-SYS: usr{{.}}include{{.}}module.map // CHECK-SYS: stdint.h #import "diamond_top.h" diff --git a/clang/test/Modules/diag-flags.cpp b/clang/test/Modules/diag-flags.cpp index 950280ee7cca0..14067c63fe4f5 100644 --- a/clang/test/Modules/diag-flags.cpp +++ b/clang/test/Modules/diag-flags.cpp @@ -1,32 +1,32 @@ // RUN: rm -rf %t // // For an implicit module, all that matters are the warning flags in the user. -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodules-cache-path=%t -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodules-cache-path=%t -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -DLOCAL_WARNING -Wpadded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -DLOCAL_ERROR -Wpadded -Werror // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -DLOCAL_ERROR -Werror=padded // // For an explicit module, all that matters are the warning flags in the module build. -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/nodiag.pcm +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts -o %t/nodiag.pcm // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -fmodule-file=%t/nodiag.pcm -Wpadded -DLOCAL_WARNING // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -fmodule-file=%t/nodiag.pcm -Werror -Wpadded -DLOCAL_ERROR // -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/warning.pcm -Wpadded +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts -o %t/warning.pcm -Wpadded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/warning.pcm // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/warning.pcm -Werror=padded -DLOCAL_ERROR // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/warning.pcm -Werror // -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/werror-no-error.pcm -Werror -Wpadded -Wno-error=padded +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts -o %t/werror-no-error.pcm -Werror -Wpadded -Wno-error=padded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/werror-no-error.pcm // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/werror-no-error.pcm -Wno-padded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DWARNING -fmodule-file=%t/werror-no-error.pcm -Werror=padded -DLOCAL_ERROR // -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/error.pcm -Werror=padded +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts -o %t/error.pcm -Werror=padded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -fmodule-file=%t/error.pcm -Wno-padded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -fmodule-file=%t/error.pcm -Wno-error=padded // -// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/werror.pcm -Werror -Wpadded +// RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_flags -x c++ %S/Inputs/module.map -fmodules-ts -o %t/werror.pcm -Werror -Wpadded // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -fmodule-file=%t/werror.pcm -Wno-error // RUN: %clang_cc1 -triple %itanium_abi_triple -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DERROR -fmodule-file=%t/werror.pcm -Wno-padded diff --git a/clang/test/Modules/diag-pragma.c b/clang/test/Modules/diag-pragma.c index 80224629a1c81..63be4bf93afcf 100644 --- a/clang/test/Modules/diag-pragma.c +++ b/clang/test/Modules/diag-pragma.c @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diag_pragma %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diag_pragma %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -verify -fmodules-cache-path=%t -I %S/Inputs %s // FIXME: When we have a syntax for modules in C, use that. diff --git a/clang/test/Modules/diag-pragma.cpp b/clang/test/Modules/diag-pragma.cpp index 0cf5db89371e7..347401fffc204 100644 --- a/clang/test/Modules/diag-pragma.cpp +++ b/clang/test/Modules/diag-pragma.cpp @@ -1,7 +1,7 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -emit-module -fmodules-cache-path=%t -fmodule-name=diag_pragma -x c++ %S/Inputs/module.modulemap -fmodules-ts +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -emit-module -fmodules-cache-path=%t -fmodule-name=diag_pragma -x c++ %S/Inputs/module.map -fmodules-ts // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_pragma -x c++ %S/Inputs/module.modulemap -fmodules-ts -o %t/explicit.pcm -Werror=string-plus-int +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -emit-module -fmodule-name=diag_pragma -x c++ %S/Inputs/module.map -fmodules-ts -o %t/explicit.pcm -Werror=string-plus-int // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -verify -fmodules-cache-path=%t -I %S/Inputs %s -fmodules-ts -DEXPLICIT_FLAG -fmodule-file=%t/explicit.pcm import diag_pragma; diff --git a/clang/test/Modules/diamond-pch.c b/clang/test/Modules/diamond-pch.c index b60420cb8ed0b..41cfd9c53b85a 100644 --- a/clang/test/Modules/diamond-pch.c +++ b/clang/test/Modules/diamond-pch.c @@ -1,8 +1,8 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_top %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_left %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_right %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_bottom %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_top %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_left %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_right %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_bottom %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-pch -fmodules-cache-path=%t -I %S/Inputs -o %t.pch %S/Inputs/diamond.h // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -include-pch %t.pch %s -I %S/Inputs -verify // FIXME: When we have a syntax for modules in C, use that. diff --git a/clang/test/Modules/diamond.c b/clang/test/Modules/diamond.c index 1e0641cafd87b..c2e009fbc1d98 100644 --- a/clang/test/Modules/diamond.c +++ b/clang/test/Modules/diamond.c @@ -1,8 +1,8 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_top %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_left %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_right %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_bottom %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_top %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_left %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_right %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodules-cache-path=%t -fmodule-name=diamond_bottom %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -I %S/Inputs %s -verify // FIXME: When we have a syntax for modules in C, use that. diff --git a/clang/test/Modules/extern_c_bad.cpp b/clang/test/Modules/extern_c_bad.cpp index cd4e5abdfbfa7..c34416a4b7156 100644 --- a/clang/test/Modules/extern_c_bad.cpp +++ b/clang/test/Modules/extern_c_bad.cpp @@ -1,2 +1,2 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -verify -fmodules -fimplicit-module-maps -x c++ -emit-module -fmodules-cache-path=%t -fmodule-name=c_library_bad %S/Inputs/module.modulemap +// RUN: %clang_cc1 -verify -fmodules -fimplicit-module-maps -x c++ -emit-module -fmodules-cache-path=%t -fmodule-name=c_library_bad %S/Inputs/module.map diff --git a/clang/test/Modules/fmodules-validate-once-per-build-session.c b/clang/test/Modules/fmodules-validate-once-per-build-session.c index c3e67834802b6..7ab6f78c194fd 100644 --- a/clang/test/Modules/fmodules-validate-once-per-build-session.c +++ b/clang/test/Modules/fmodules-validate-once-per-build-session.c @@ -11,8 +11,8 @@ // foo.h as a system header. // RUN: echo 'void meow(void);' > %t/Inputs/foo.h // RUN: echo 'void woof(void);' > %t/Inputs/bar.h -// RUN: echo 'module Foo { header "foo.h" }' > %t/Inputs/module.modulemap -// RUN: echo 'extern module Bar "bar.modulemap"' >> %t/Inputs/module.modulemap +// RUN: echo 'module Foo { header "foo.h" }' > %t/Inputs/module.map +// RUN: echo 'extern module Bar "bar.modulemap"' >> %t/Inputs/module.map // RUN: echo 'module Bar { header "bar.h" }' > %t/Inputs/bar.modulemap // === @@ -53,7 +53,7 @@ // === // Use the module, and make sure that we did not recompile it if foo.h or -// module.modulemap are system files, even though the sources changed. +// module.map are system files, even though the sources changed. // RUN: %clang_cc1 -cc1 -fmodules -fimplicit-module-maps -fdisable-module-hash -fmodules-cache-path=%t/modules-cache -fsyntax-only -isystem %t/Inputs -fmodules-validate-system-headers -fbuild-session-timestamp=1390000000 -fmodules-validate-once-per-build-session %s // RUN: %clang_cc1 -cc1 -fmodules -fimplicit-module-maps -fdisable-module-hash -fmodules-cache-path=%t/modules-cache-user -fsyntax-only -I %t/Inputs -fmodules-validate-system-headers -fbuild-session-timestamp=1390000000 -fmodules-validate-once-per-build-session %s // RUN: ls -R %t/modules-cache | grep Foo.pcm.timestamp diff --git a/clang/test/Modules/fsystem-module.m b/clang/test/Modules/fsystem-module.m index 7eeb35d18f0a1..6ef91b762b0f4 100644 --- a/clang/test/Modules/fsystem-module.m +++ b/clang/test/Modules/fsystem-module.m @@ -6,13 +6,13 @@ // RUN: not %clang_cc1 -fmodules -I %S/Inputs \ // RUN: -emit-module -fmodule-name=warning -pedantic -Werror \ -// RUN: %S/Inputs/module.modulemap -o %t.dir/warning.pcm +// RUN: %S/Inputs/module.map -o %t.dir/warning.pcm // RUN: %clang_cc1 -fmodules -I %S/Inputs \ // RUN: -emit-module -fmodule-name=warning -pedantic -Werror \ -// RUN: %S/Inputs/module.modulemap -o %t.dir/warning-system.pcm -fsystem-module +// RUN: %S/Inputs/module.map -o %t.dir/warning-system.pcm -fsystem-module // RUN: not %clang_cc1 -fmodules -I %S/Inputs \ // RUN: -emit-module -fmodule-name=warning -pedantic -Werror \ -// RUN: %S/Inputs/module.modulemap -o %t.dir/warning-system.pcm -fsystem-module \ +// RUN: %S/Inputs/module.map -o %t.dir/warning-system.pcm -fsystem-module \ // RUN: -Wsystem-headers diff --git a/clang/test/Modules/irgen.c b/clang/test/Modules/irgen.c index a1e07eb1d87e9..92bd855c90753 100644 --- a/clang/test/Modules/irgen.c +++ b/clang/test/Modules/irgen.c @@ -1,6 +1,6 @@ // REQUIRES: x86-registered-target // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=irgen -triple x86_64-apple-darwin10 %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=irgen -triple x86_64-apple-darwin10 %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -I %S/Inputs -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s // FIXME: When we have a syntax for modules in C, use that. diff --git a/clang/test/Modules/linkage-merge.m b/clang/test/Modules/linkage-merge.m index c38524fa577be..e7b9e5cec1367 100644 --- a/clang/test/Modules/linkage-merge.m +++ b/clang/test/Modules/linkage-merge.m @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=linkage_merge_left %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=linkage_merge_left %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs -w %s -verify // Test redeclarations of functions where the original declaration is diff --git a/clang/test/Modules/load_failure.c b/clang/test/Modules/load_failure.c index 3a8d29597348d..6e63ba2adb196 100644 --- a/clang/test/Modules/load_failure.c +++ b/clang/test/Modules/load_failure.c @@ -7,7 +7,7 @@ #endif // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fdisable-module-hash -emit-module -fmodule-name=load_failure %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fdisable-module-hash -emit-module -fmodule-name=load_failure %S/Inputs/module.map // RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -I %S/Inputs -fdisable-module-hash %s -DNONEXISTENT 2>&1 | FileCheck -check-prefix=CHECK-NONEXISTENT %s // CHECK-NONEXISTENT: load_failure.c:2:9: fatal error: module 'load_nonexistent' not found diff --git a/clang/test/Modules/lookup.cpp b/clang/test/Modules/lookup.cpp index 95c30bf3eedff..e847d78b274f1 100644 --- a/clang/test/Modules/lookup.cpp +++ b/clang/test/Modules/lookup.cpp @@ -24,8 +24,8 @@ void f() { } // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -emit-module -fmodules-cache-path=%t -fmodule-name=lookup_left_cxx %S/Inputs/module.modulemap -verify -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -emit-module -fmodules-cache-path=%t -fmodule-name=lookup_right_cxx %S/Inputs/module.modulemap -verify +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -emit-module -fmodules-cache-path=%t -fmodule-name=lookup_left_cxx %S/Inputs/module.map -verify +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -emit-module -fmodules-cache-path=%t -fmodule-name=lookup_right_cxx %S/Inputs/module.map -verify // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -I %S/Inputs %s -verify // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -ast-print -x objective-c++ -fmodules-cache-path=%t -I %S/Inputs %s | FileCheck -check-prefix=CHECK-PRINT %s // FIXME: When we have a syntax for modules in C++, use that. diff --git a/clang/test/Modules/lookup.m b/clang/test/Modules/lookup.m index 33e0408d8481d..0e09bfdd7fd95 100644 --- a/clang/test/Modules/lookup.m +++ b/clang/test/Modules/lookup.m @@ -1,6 +1,6 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -emit-module -x objective-c -fmodule-name=lookup_left_objc %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -emit-module -x objective-c -fmodule-name=lookup_right_objc %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -emit-module -x objective-c -fmodule-name=lookup_left_objc %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -emit-module -x objective-c -fmodule-name=lookup_right_objc %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -I %S/Inputs -verify %s // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -ast-print -x objective-c -fmodules-cache-path=%t -I %S/Inputs %s | FileCheck -check-prefix=CHECK-PRINT %s diff --git a/clang/test/Modules/merge-concepts.cppm b/clang/test/Modules/merge-concepts.cppm index d16f0a2f660d3..ca4877bfd7949 100644 --- a/clang/test/Modules/merge-concepts.cppm +++ b/clang/test/Modules/merge-concepts.cppm @@ -24,16 +24,16 @@ // // RUN: rm -f %t/foo.pcm // RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fprebuilt-module-path=%t \ -// RUN: -fmodule-map-file=%t/module.modulemap %t/Use7.cpp -verify -fsyntax-only +// RUN: -fmodule-map-file=%t/module.map %t/Use7.cpp -verify -fsyntax-only // RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fprebuilt-module-path=%t \ -// RUN: -fmodule-map-file=%t/module.modulemap %t/Use7.cpp -verify -fsyntax-only +// RUN: -fmodule-map-file=%t/module.map %t/Use7.cpp -verify -fsyntax-only // Testing module map modules with named modules. -// RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%t/module.modulemap \ +// RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%t/module.map \ // RUN: %t/A.cppm -o %t/A.pcm // RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fprebuilt-module-path=%t \ -// RUN: -fmodule-map-file=%t/module.modulemap %t/Use7.cpp -verify -fsyntax-only +// RUN: -fmodule-map-file=%t/module.map %t/Use7.cpp -verify -fsyntax-only // RUN: %clang_cc1 -std=c++20 -fmodules -fmodules-cache-path=%t -fprebuilt-module-path=%t \ -// RUN: -fmodule-map-file=%t/module.modulemap %t/Use7.cpp -verify -fsyntax-only +// RUN: -fmodule-map-file=%t/module.map %t/Use7.cpp -verify -fsyntax-only // //--- foo.h @@ -160,7 +160,7 @@ template void foo() requires same_as {} -//--- module.modulemap +//--- module.map module "foo" { export * header "foo.h" diff --git a/clang/test/Modules/missing-header.m b/clang/test/Modules/missing-header.m index c162e1b5f08b3..d865078e3a2f8 100644 --- a/clang/test/Modules/missing-header.m +++ b/clang/test/Modules/missing-header.m @@ -9,5 +9,5 @@ // CHECK-NOT: missing_unavailable_headers @import missing_headers; -// CHECK: module.modulemap:15:27: error: header 'missing.h' not found +// CHECK: module.map:15:27: error: header 'missing.h' not found // CHECK: could not build module 'missing_headers' diff --git a/clang/test/Modules/modify-module.m b/clang/test/Modules/modify-module.m index 903bf4018b01a..d59a4799104ff 100644 --- a/clang/test/Modules/modify-module.m +++ b/clang/test/Modules/modify-module.m @@ -5,7 +5,7 @@ // RUN: mkdir -p %t/include // RUN: cat %S/Inputs/Modified/A.h > %t/include/A.h // RUN: cat %S/Inputs/Modified/B.h > %t/include/B.h -// RUN: cat %S/Inputs/Modified/module.modulemap > %t/include/module.modulemap +// RUN: cat %S/Inputs/Modified/module.map > %t/include/module.map // RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -fimplicit-module-maps -I %t/include %s -verify // RUN: echo '' >> %t/include/B.h // RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -fimplicit-module-maps -I %t/include %s -verify diff --git a/clang/test/Modules/module-file-home-is-cwd.m b/clang/test/Modules/module-file-home-is-cwd.m index d87e39860c50e..57f8856406484 100644 --- a/clang/test/Modules/module-file-home-is-cwd.m +++ b/clang/test/Modules/module-file-home-is-cwd.m @@ -1,11 +1,11 @@ // RUN: cd %S // RUN: %clang_cc1 -x objective-c -fmodules -fno-implicit-modules \ // RUN: -fmodule-file-home-is-cwd -fmodule-name=libA -emit-module \ -// RUN: -fmodules-embed-all-files %S/Inputs/normal-module-map/module.modulemap \ +// RUN: -fmodules-embed-all-files %S/Inputs/normal-module-map/module.map \ // RUN: -o %t/mod.pcm // RUN: llvm-bcanalyzer --dump --disable-histogram %t/mod.pcm | FileCheck %s -// CHECK: blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}module.modulemap' +// CHECK: blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}module.map' // CHECK: blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}a2.h' // CHECK: blob data = 'Inputs{{/|\\}}normal-module-map{{/|\\}}a1.h' // CHECK-NOT: MODULE_DIRECTORY @@ -15,7 +15,7 @@ // RUN: cd %t // RUN: %clang_cc1 -x objective-c -fmodules -fno-implicit-modules -debug-info-kind=limited \ // RUN: -debugger-tuning=lldb -dwarf-ext-refs -fmodule-file-home-is-cwd \ -// RUN: -fmodule-map-file=%S/Inputs/normal-module-map/module.modulemap \ +// RUN: -fmodule-map-file=%S/Inputs/normal-module-map/module.map \ // RUN: -fmodule-file=libA=mod.pcm -emit-llvm -o %t-mod.ll %s // RUN: cat %t-mod.ll | FileCheck %s --check-prefix=SKELETON diff --git a/clang/test/Modules/module-private.cpp b/clang/test/Modules/module-private.cpp index 4036c345ef3c9..2848226ba067c 100644 --- a/clang/test/Modules/module-private.cpp +++ b/clang/test/Modules/module-private.cpp @@ -1,6 +1,6 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -std=c++17 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fmodule-name=module_private_left -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -std=c++17 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fmodule-name=module_private_right -emit-module %S/Inputs/module.modulemap +// RUN: %clang_cc1 -std=c++17 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fmodule-name=module_private_left -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -std=c++17 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -fmodule-name=module_private_right -emit-module %S/Inputs/module.map // RUN: %clang_cc1 -std=c++17 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -I %S/Inputs %s -verify // FIXME: When we have a syntax for modules in C++, use that. diff --git a/clang/test/Modules/module_file_info.m b/clang/test/Modules/module_file_info.m index 142ce4dc3adf4..f4edb4a82d176 100644 --- a/clang/test/Modules/module_file_info.m +++ b/clang/test/Modules/module_file_info.m @@ -16,7 +16,7 @@ // CHECK: Generated by this Clang: // CHECK: Module name: DependsOnModule -// CHECK: Module map file: {{.*}}DependsOnModule.framework{{[/\\]}}Modules{{[/\\]}}module.modulemap +// CHECK: Module map file: {{.*}}DependsOnModule.framework{{[/\\]}}module.map // CHECK: Imports module 'Module': {{.*}}Module{{.*}}.pcm // CHECK: Language options: @@ -47,10 +47,10 @@ // MACROS: Predefined macros: // MACROS-NEXT: -DBLARG // MACROS-NEXT: -DWIBBLE=WOBBLE -// CHECK: Input file: {{.*}}module.modulemap -// CHECK-NEXT: Input file: {{.*}}module.private.modulemap +// CHECK: Input file: {{.*}}module.map +// CHECK-NEXT: Input file: {{.*}}module_private.map // CHECK-NEXT: Input file: {{.*}}DependsOnModule.h -// CHECK-NEXT: Input file: {{.*}}module.modulemap +// CHECK-NEXT: Input file: {{.*}}module.map // CHECK-NEXT: Input file: {{.*}}other.h // CHECK-NEXT: Input file: {{.*}}not_cxx.h // CHECK-NEXT: Input file: {{.*}}not_coroutines.h diff --git a/clang/test/Modules/modulemap-locations.m b/clang/test/Modules/modulemap-locations.m index 330a03d1fb633..e5738e105263a 100644 --- a/clang/test/Modules/modulemap-locations.m +++ b/clang/test/Modules/modulemap-locations.m @@ -2,13 +2,9 @@ // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs/ModuleMapLocations/Module_ModuleMap -I %S/Inputs/ModuleMapLocations/Both -F %S/Inputs/ModuleMapLocations -I %S/Inputs/ModuleMapLocations -F %S/Inputs -x objective-c -fsyntax-only %s -verify -Wno-private-module // regular -@import module_map; // expected-warning@*{{as a module map name is deprecated, rename it to module.modulemap}} - // expected-warning@*{{as a module map name is deprecated, rename it to module.private.modulemap}} @import module_modulemap; @import both; // framework -@import Module_Map_F; // expected-warning@*{{as a module map name is deprecated, rename it to module.modulemap in the 'Modules' directory of the framework}} -@import Module_Map_F; // expected-warning@*{{as a module map name is deprecated, rename it to module.private.modulemap in the 'Modules' directory of the framework}} @import Module_ModuleMap_F; @import Module_ModuleMap_F.Private; @import Both_F; diff --git a/clang/test/Modules/no-stale-modtime.m b/clang/test/Modules/no-stale-modtime.m index 92c18ac591add..c7ff21c22a9f5 100644 --- a/clang/test/Modules/no-stale-modtime.m +++ b/clang/test/Modules/no-stale-modtime.m @@ -11,9 +11,9 @@ // RUN: echo '// top' > %t/t.h-1 // RUN: cat %t/t.h-1 > %t/t.h -// RUN: echo 'module b { header "b.h" } module l { header "l.h" }' > %t/module.modulemap-1 -// RUN: echo 'module r { header "r.h" } module t { header "t.h" }' > %t/module.modulemap-2 -// RUN: cat %t/module.modulemap-1 %t/module.modulemap-2 > %t/module.modulemap +// RUN: echo 'module b { header "b.h" } module l { header "l.h" }' > %t/module.map-1 +// RUN: echo 'module r { header "r.h" } module t { header "t.h" }' > %t/module.map-2 +// RUN: cat %t/module.map-1 %t/module.map-2 > %t/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -fdisable-module-hash \ // RUN: -I %t -fsyntax-only %s -Rmodule-build 2>&1 \ diff --git a/clang/test/Modules/objc-at-keyword.m b/clang/test/Modules/objc-at-keyword.m index b4136cfecbd07..0e058a309017a 100644 --- a/clang/test/Modules/objc-at-keyword.m +++ b/clang/test/Modules/objc-at-keyword.m @@ -1,6 +1,6 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -verify -x objective-c -fmodule-name=objcAtKeywordMissingEnd -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=Empty -emit-module %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -verify -x objective-c -fmodule-name=objcAtKeywordMissingEnd -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=Empty -emit-module %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -verify -I %S/Inputs %s @interface X // expected-note {{class started here}} diff --git a/clang/test/Modules/objc-categories.m b/clang/test/Modules/objc-categories.m index 0f0745087d3cd..fcffe3cc96200 100644 --- a/clang/test/Modules/objc-categories.m +++ b/clang/test/Modules/objc-categories.m @@ -1,9 +1,9 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_top -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_left -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_right -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_bottom -emit-module %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_other -emit-module %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_top -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_left -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_right -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_bottom -emit-module %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=category_other -emit-module %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs %s -verify @import category_bottom; diff --git a/clang/test/Modules/objc-type-param.m b/clang/test/Modules/objc-type-param.m index cf6008768cbe5..3417d62b25ffb 100644 --- a/clang/test/Modules/objc-type-param.m +++ b/clang/test/Modules/objc-type-param.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=objc_type_param -emit-module %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -x objective-c -fmodule-name=objc_type_param -emit-module %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs %s -verify @import objc_type_param; diff --git a/clang/test/Modules/objc_redef.m b/clang/test/Modules/objc_redef.m index be6e08855ac21..ab3a77ae68a97 100644 --- a/clang/test/Modules/objc_redef.m +++ b/clang/test/Modules/objc_redef.m @@ -7,15 +7,15 @@ int test(id x) { } // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=weird_objc %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=weird_objc %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs %s -verify // Try explicit too. -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.modulemap -o %t/redeclarations_left.pcm -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-name=weird_objc %S/Inputs/module.modulemap -o %t/weird_objc.pcm -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-file=%t/weird_objc.pcm -fmodule-name=objc_redef_indirect %S/Inputs/module.modulemap -o %t/objc_redef_indirect.pcm -I %S/Inputs +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.map -o %t/redeclarations_left.pcm +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-name=weird_objc %S/Inputs/module.map -o %t/weird_objc.pcm +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -emit-module -fmodule-file=%t/weird_objc.pcm -fmodule-name=objc_redef_indirect %S/Inputs/module.map -o %t/objc_redef_indirect.pcm -I %S/Inputs // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodule-file=%t/redeclarations_left.pcm -fmodule-file=%t/weird_objc.pcm -fmodule-file=%t/objc_redef_indirect.pcm -I %S/Inputs %s -verify // expected-no-diagnostics diff --git a/clang/test/Modules/odr_hash-blocks.cpp b/clang/test/Modules/odr_hash-blocks.cpp index b1e62a1cf0b99..512c659f841e4 100644 --- a/clang/test/Modules/odr_hash-blocks.cpp +++ b/clang/test/Modules/odr_hash-blocks.cpp @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x c++ -std=c++11 -fblocks %t/Inputs/second.h // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -fmodules -fimplicit-module-maps \ diff --git a/clang/test/Modules/odr_hash-gnu.cpp b/clang/test/Modules/odr_hash-gnu.cpp index eef6af63ba7c9..bb5ad9da38388 100644 --- a/clang/test/Modules/odr_hash-gnu.cpp +++ b/clang/test/Modules/odr_hash-gnu.cpp @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x c++ -std=gnu++11 %t/Inputs/second.h // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x c++ -I%t/Inputs -verify %s -std=gnu++11 diff --git a/clang/test/Modules/odr_hash-vector.cpp b/clang/test/Modules/odr_hash-vector.cpp index e2da431a73255..ee59cb617c1a6 100644 --- a/clang/test/Modules/odr_hash-vector.cpp +++ b/clang/test/Modules/odr_hash-vector.cpp @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x c++ -std=c++11 %t/Inputs/second.h -fzvector // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x c++ -I%t/Inputs -verify %s -std=c++11 -fzvector diff --git a/clang/test/Modules/odr_hash.cl b/clang/test/Modules/odr_hash.cl index 474da6e62f159..d4af1cea6e265 100644 --- a/clang/test/Modules/odr_hash.cl +++ b/clang/test/Modules/odr_hash.cl @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x c++ %t/Inputs/second.h -cl-std=CL2.0 // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x c++ -I%t/Inputs -verify %s -cl-std=CL2.0 diff --git a/clang/test/Modules/odr_hash.cpp b/clang/test/Modules/odr_hash.cpp index 808fc85d4c961..fb756013bc9bb 100644 --- a/clang/test/Modules/odr_hash.cpp +++ b/clang/test/Modules/odr_hash.cpp @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x c++ -std=c++1z %t/Inputs/second.h // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -triple x86_64-linux-gnu -x c++ -std=c++1z \ diff --git a/clang/test/Modules/odr_hash.mm b/clang/test/Modules/odr_hash.mm index 80688cd86e2d9..25c46bace130b 100644 --- a/clang/test/Modules/odr_hash.mm +++ b/clang/test/Modules/odr_hash.mm @@ -17,12 +17,12 @@ // RUN: %clang_cc1 -fsyntax-only -x objective-c++ %t/Inputs/second.h -fblocks -fobjc-arc // Build module map file -// RUN: echo "module FirstModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"first.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap -// RUN: echo "module SecondModule {" >> %t/Inputs/module.modulemap -// RUN: echo " header \"second.h\"" >> %t/Inputs/module.modulemap -// RUN: echo "}" >> %t/Inputs/module.modulemap +// RUN: echo "module FirstModule {" >> %t/Inputs/module.map +// RUN: echo " header \"first.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map +// RUN: echo "module SecondModule {" >> %t/Inputs/module.map +// RUN: echo " header \"second.h\"" >> %t/Inputs/module.map +// RUN: echo "}" >> %t/Inputs/module.map // Run test // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c++ -I%t/Inputs -verify %s -fblocks -fobjc-arc diff --git a/clang/test/Modules/pragma-pack.cpp b/clang/test/Modules/pragma-pack.cpp index 8239cafd6907e..96a880c6307b0 100644 --- a/clang/test/Modules/pragma-pack.cpp +++ b/clang/test/Modules/pragma-pack.cpp @@ -2,7 +2,7 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fmodules \ // RUN: -fimplicit-module-maps -x c++ -emit-module \ // RUN: -fmodules-cache-path=%t.cache \ -// RUN: -fmodule-name=pragma_pack %S/Inputs/module.modulemap +// RUN: -fmodule-name=pragma_pack %S/Inputs/module.map // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fmodules \ // RUN: -fimplicit-module-maps -x c++ -verify \ // RUN: -fmodules-cache-path=%t.cache \ @@ -11,7 +11,7 @@ // RUN: -fmodules-local-submodule-visibility \ // RUN: -fimplicit-module-maps -x c++ -emit-module \ // RUN: -fmodules-cache-path=%tlocal.cache \ -// RUN: -fmodule-name=pragma_pack %S/Inputs/module.modulemap +// RUN: -fmodule-name=pragma_pack %S/Inputs/module.map // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fmodules \ // RUN: -fmodules-local-submodule-visibility \ // RUN: -fimplicit-module-maps -x c++ -verify \ diff --git a/clang/test/Modules/recursive.c b/clang/test/Modules/recursive.c index efb21320f7768..9c03a6ac4548b 100644 --- a/clang/test/Modules/recursive.c +++ b/clang/test/Modules/recursive.c @@ -3,7 +3,7 @@ #include "recursive1.h" // RUN: rm -rf %t -// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=recursive1 %S/Inputs/module.modulemap 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=recursive1 %S/Inputs/module.map 2>&1 | FileCheck %s // CHECK: While building module 'recursive1'{{( imported from .*[/\]recursive.c:3)?}}: // CHECK-NEXT: While building module 'recursive2' imported from {{.*Inputs[/\]}}recursive1.h:1: diff --git a/clang/test/Modules/redecl-namespaces.mm b/clang/test/Modules/redecl-namespaces.mm index 9732b31f2b92d..e17af86feba81 100644 --- a/clang/test/Modules/redecl-namespaces.mm +++ b/clang/test/Modules/redecl-namespaces.mm @@ -8,6 +8,6 @@ void test() { } // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -emit-module -fmodule-name=redecl_namespaces_left %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -emit-module -fmodule-name=redecl_namespaces_right %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -emit-module -fmodule-name=redecl_namespaces_left %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c++ -fmodules-cache-path=%t -emit-module -fmodule-name=redecl_namespaces_right %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs -w %s -verify diff --git a/clang/test/Modules/redeclarations.m b/clang/test/Modules/redeclarations.m index dacc84c6df469..e3f78f28d75c5 100644 --- a/clang/test/Modules/redeclarations.m +++ b/clang/test/Modules/redeclarations.m @@ -5,8 +5,8 @@ @interface MyObject : NSObject @end // RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.modulemap -// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_right %S/Inputs/module.modulemap +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_left %S/Inputs/module.map +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x objective-c -fmodules-cache-path=%t -emit-module -fmodule-name=redeclarations_right %S/Inputs/module.map // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t -I %S/Inputs %s -verify // expected-no-diagnostics diff --git a/clang/test/Modules/relative-submodule-topheader.m b/clang/test/Modules/relative-submodule-topheader.m index ec973a9c96893..c7c2f13076866 100644 --- a/clang/test/Modules/relative-submodule-topheader.m +++ b/clang/test/Modules/relative-submodule-topheader.m @@ -1,5 +1,5 @@ // RUN: cd %S -// RUN: %clang_cc1 -fmodules -fno-implicit-modules -x objective-c++ -fmodule-name=std -emit-module Inputs/submodules/module.modulemap -o %t/mod.pcm +// RUN: %clang_cc1 -fmodules -fno-implicit-modules -x objective-c++ -fmodule-name=std -emit-module Inputs/submodules/module.map -o %t/mod.pcm // RUN: llvm-bcanalyzer --dump --disable-histogram %t/mod.pcm | FileCheck %s // CHECK: blob data = 'vector.h' diff --git a/clang/test/Modules/requires-coroutines.mm b/clang/test/Modules/requires-coroutines.mm index d7412165bb9cc..4e9c9d19cd800 100644 --- a/clang/test/Modules/requires-coroutines.mm +++ b/clang/test/Modules/requires-coroutines.mm @@ -4,10 +4,10 @@ #ifdef COROUTINES @import DependsOnModule.Coroutines; -// expected-error@Modules/module.modulemap:29 {{module 'DependsOnModule.NotCoroutines' is incompatible with feature 'coroutines'}} +// expected-error@module.map:29 {{module 'DependsOnModule.NotCoroutines' is incompatible with feature 'coroutines'}} @import DependsOnModule.NotCoroutines; // expected-note {{module imported here}} #else @import DependsOnModule.NotCoroutines; -// expected-error@Modules/module.modulemap:25 {{module 'DependsOnModule.Coroutines' requires feature 'coroutines'}} +// expected-error@module.map:25 {{module 'DependsOnModule.Coroutines' requires feature 'coroutines'}} @import DependsOnModule.Coroutines; // expected-note {{module imported here}} #endif diff --git a/clang/test/Modules/requires-gnuinlineasm.m b/clang/test/Modules/requires-gnuinlineasm.m index e1900b1451079..e710b6bf8d4b5 100644 --- a/clang/test/Modules/requires-gnuinlineasm.m +++ b/clang/test/Modules/requires-gnuinlineasm.m @@ -9,7 +9,7 @@ // RUN: -DASM_INLINE -verify #ifdef NO_ASM_INLINE -// expected-error@NeedsGNUInlineAsm.framework/Modules/module.modulemap:4 {{module 'NeedsGNUInlineAsm.Asm' requires feature 'gnuinlineasm'}} +// expected-error@NeedsGNUInlineAsm.framework/module.map:4 {{module 'NeedsGNUInlineAsm.Asm' requires feature 'gnuinlineasm'}} @import NeedsGNUInlineAsm.Asm; // expected-note {{module imported here}} #endif diff --git a/clang/test/Modules/requires.m b/clang/test/Modules/requires.m index 4b94fcb1a4507..0ba51d4609ce0 100644 --- a/clang/test/Modules/requires.m +++ b/clang/test/Modules/requires.m @@ -2,31 +2,31 @@ // RUN: %clang_cc1 -Rmodule-include-translation -Wno-private-module -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs -I %S/Inputs %s -verify -fmodule-feature custom_req1 // RUN: %clang_cc1 -Rmodule-include-translation -Wno-private-module -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs -I %S/Inputs %s -verify -std=c89 -DTEST_C_FEATURES #ifndef TEST_C_FEATURES -// expected-error@DependsOnModule.framework/Modules/module.modulemap:7 {{module 'DependsOnModule.CXX' requires feature 'cplusplus'}} +// expected-error@DependsOnModule.framework/module.map:7 {{module 'DependsOnModule.CXX' requires feature 'cplusplus'}} @import DependsOnModule.CXX; // expected-note {{module imported here}} @import DependsOnModule.NotCXX; -// expected-error@DependsOnModule.framework/Modules/module.modulemap:15 {{module 'DependsOnModule.NotObjC' is incompatible with feature 'objc'}} +// expected-error@DependsOnModule.framework/module.map:15 {{module 'DependsOnModule.NotObjC' is incompatible with feature 'objc'}} @import DependsOnModule.NotObjC; // expected-note {{module imported here}} @import DependsOnModule.CustomReq1; // OK -// expected-error@DependsOnModule.framework/Modules/module.modulemap:22 {{module 'DependsOnModule.CustomReq2' requires feature 'custom_req2'}} +// expected-error@DependsOnModule.framework/module.map:22 {{module 'DependsOnModule.CustomReq2' requires feature 'custom_req2'}} @import DependsOnModule.CustomReq2; // expected-note {{module imported here}} @import RequiresWithMissingHeader; // OK -// expected-error@module.modulemap:* {{module 'RequiresWithMissingHeader.HeaderBefore' requires feature 'missing'}} +// expected-error@module.map:* {{module 'RequiresWithMissingHeader.HeaderBefore' requires feature 'missing'}} @import RequiresWithMissingHeader.HeaderBefore; // expected-note {{module imported here}} -// expected-error@module.modulemap:* {{module 'RequiresWithMissingHeader.HeaderAfter' requires feature 'missing'}} +// expected-error@module.map:* {{module 'RequiresWithMissingHeader.HeaderAfter' requires feature 'missing'}} @import RequiresWithMissingHeader.HeaderAfter; // expected-note {{module imported here}} -// expected-error@DependsOnModule.framework/Modules/module.modulemap:40 {{module 'DependsOnModule.CXX11' requires feature 'cplusplus11'}} +// expected-error@DependsOnModule.framework/module.map:40 {{module 'DependsOnModule.CXX11' requires feature 'cplusplus11'}} @import DependsOnModule.CXX11; // expected-note {{module imported here}} -// expected-error@DependsOnModule.framework/Modules/module.modulemap:43 {{module 'DependsOnModule.CXX14' requires feature 'cplusplus14'}} +// expected-error@DependsOnModule.framework/module.map:43 {{module 'DependsOnModule.CXX14' requires feature 'cplusplus14'}} @import DependsOnModule.CXX14; // expected-note {{module imported here}} -// expected-error@DependsOnModule.framework/Modules/module.modulemap:46 {{module 'DependsOnModule.CXX17' requires feature 'cplusplus17'}} +// expected-error@DependsOnModule.framework/module.map:46 {{module 'DependsOnModule.CXX17' requires feature 'cplusplus17'}} @import DependsOnModule.CXX17; // expected-note {{module imported here}} #else -// expected-error@DependsOnModule.framework/Modules/module.modulemap:49 {{module 'DependsOnModule.C99' requires feature 'c99'}} +// expected-error@DependsOnModule.framework/module.map:49 {{module 'DependsOnModule.C99' requires feature 'c99'}} @import DependsOnModule.C99; // expected-note {{module imported here}} -// expected-error@DependsOnModule.framework/Modules/module.modulemap:52 {{module 'DependsOnModule.C11' requires feature 'c11'}} +// expected-error@DependsOnModule.framework/module.map:52 {{module 'DependsOnModule.C11' requires feature 'c11'}} @import DependsOnModule.C11; // expected-note {{module imported here}} -// expected-error@DependsOnModule.framework/Modules/module.modulemap:55 {{module 'DependsOnModule.C17' requires feature 'c17'}} +// expected-error@DependsOnModule.framework/module.map:55 {{module 'DependsOnModule.C17' requires feature 'c17'}} @import DependsOnModule.C17; // expected-note {{module imported here}} #endif diff --git a/clang/test/Modules/requires.mm b/clang/test/Modules/requires.mm index 943823994eeb2..4b11fcb33e1b9 100644 --- a/clang/test/Modules/requires.mm +++ b/clang/test/Modules/requires.mm @@ -2,7 +2,7 @@ // RUN: %clang_cc1 -Rmodule-include-translation -Wno-private-module -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs -I %S/Inputs/DependsOnModule.framework %s -verify @import DependsOnModule.CXX; -// expected-error@Modules/module.modulemap:11 {{module 'DependsOnModule.NotCXX' is incompatible with feature 'cplusplus'}} +// expected-error@module.map:11 {{module 'DependsOnModule.NotCXX' is incompatible with feature 'cplusplus'}} @import DependsOnModule.NotCXX; // expected-note {{module imported here}} -// expected-error@Modules/module.modulemap:15 {{module 'DependsOnModule.NotObjC' is incompatible with feature 'objc'}} +// expected-error@module.map:15 {{module 'DependsOnModule.NotObjC' is incompatible with feature 'objc'}} @import DependsOnModule.NotObjC; // expected-note {{module imported here}} diff --git a/clang/test/Modules/target-platform-features.m b/clang/test/Modules/target-platform-features.m index 08fad5b4432af..875c83a2a545b 100644 --- a/clang/test/Modules/target-platform-features.m +++ b/clang/test/Modules/target-platform-features.m @@ -4,17 +4,17 @@ // RUN: mkdir %t/cache // RUN: mkdir %t/InputsA -// RUN: echo "module RequiresMacOS {" >> %t/InputsA/module.modulemap -// RUN: echo " requires macos" >> %t/InputsA/module.modulemap -// RUN: echo "}" >> %t/InputsA/module.modulemap -// RUN: echo "module RequiresNotiOS {" >> %t/InputsA/module.modulemap -// RUN: echo " requires !ios" >> %t/InputsA/module.modulemap -// RUN: echo "}" >> %t/InputsA/module.modulemap -// RUN: echo "module RequiresMain {" >> %t/InputsA/module.modulemap -// RUN: echo " module SubRequiresNotiOS {" >> %t/InputsA/module.modulemap -// RUN: echo " requires !ios" >> %t/InputsA/module.modulemap -// RUN: echo " }" >> %t/InputsA/module.modulemap -// RUN: echo "}" >> %t/InputsA/module.modulemap +// RUN: echo "module RequiresMacOS {" >> %t/InputsA/module.map +// RUN: echo " requires macos" >> %t/InputsA/module.map +// RUN: echo "}" >> %t/InputsA/module.map +// RUN: echo "module RequiresNotiOS {" >> %t/InputsA/module.map +// RUN: echo " requires !ios" >> %t/InputsA/module.map +// RUN: echo "}" >> %t/InputsA/module.map +// RUN: echo "module RequiresMain {" >> %t/InputsA/module.map +// RUN: echo " module SubRequiresNotiOS {" >> %t/InputsA/module.map +// RUN: echo " requires !ios" >> %t/InputsA/module.map +// RUN: echo " }" >> %t/InputsA/module.map +// RUN: echo "}" >> %t/InputsA/module.map // RUN: %clang_cc1 -triple=x86_64-apple-macosx10.6 -DENABLE_DARWIN -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c -I%t/InputsA -verify %s // expected-no-diagnostics @@ -32,9 +32,9 @@ #endif // RUN: mkdir %t/InputsB -// RUN: echo "module RequiresiOSSim {" >> %t/InputsB/module.modulemap -// RUN: echo " requires iossimulator" >> %t/InputsB/module.modulemap -// RUN: echo "}" >> %t/InputsB/module.modulemap +// RUN: echo "module RequiresiOSSim {" >> %t/InputsB/module.map +// RUN: echo " requires iossimulator" >> %t/InputsB/module.map +// RUN: echo "}" >> %t/InputsB/module.map // RUN: %clang_cc1 -triple=x86_64-apple-iossimulator -DENABLE_IOSSIM -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c -I%t/InputsB %s -verify // RUN: %clang_cc1 -triple=x86_64-apple-ios-simulator -DENABLE_IOSSIM -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c -I%t/InputsB %s -verify @@ -43,15 +43,15 @@ #endif // RUN: mkdir %t/InputsC -// RUN: echo "module RequiresLinuxEABIA {" >> %t/InputsC/module.modulemap -// RUN: echo " requires linux, gnueabi" >> %t/InputsC/module.modulemap -// RUN: echo "}" >> %t/InputsC/module.modulemap -// RUN: echo "module RequiresLinuxEABIB {" >> %t/InputsC/module.modulemap -// RUN: echo " requires gnueabi" >> %t/InputsC/module.modulemap -// RUN: echo "}" >> %t/InputsC/module.modulemap -// RUN: echo "module RequiresLinuxEABIC {" >> %t/InputsC/module.modulemap -// RUN: echo " requires linux" >> %t/InputsC/module.modulemap -// RUN: echo "}" >> %t/InputsC/module.modulemap +// RUN: echo "module RequiresLinuxEABIA {" >> %t/InputsC/module.map +// RUN: echo " requires linux, gnueabi" >> %t/InputsC/module.map +// RUN: echo "}" >> %t/InputsC/module.map +// RUN: echo "module RequiresLinuxEABIB {" >> %t/InputsC/module.map +// RUN: echo " requires gnueabi" >> %t/InputsC/module.map +// RUN: echo "}" >> %t/InputsC/module.map +// RUN: echo "module RequiresLinuxEABIC {" >> %t/InputsC/module.map +// RUN: echo " requires linux" >> %t/InputsC/module.map +// RUN: echo "}" >> %t/InputsC/module.map // RUN: %clang_cc1 -triple=armv8r-none-linux-gnueabi -DENABLE_LINUXEABI -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c -I%t/InputsC %s -verify #ifdef ENABLE_LINUXEABI @@ -61,15 +61,15 @@ #endif // RUN: mkdir %t/InputsD -// RUN: echo "module RequiresWinMSVCA {" >> %t/InputsD/module.modulemap -// RUN: echo " requires windows" >> %t/InputsD/module.modulemap -// RUN: echo "}" >> %t/InputsD/module.modulemap -// RUN: echo "module RequiresWinMSVCB {" >> %t/InputsD/module.modulemap -// RUN: echo " requires windows, msvc" >> %t/InputsD/module.modulemap -// RUN: echo "}" >> %t/InputsD/module.modulemap -// RUN: echo "module RequiresWinMSVCC {" >> %t/InputsD/module.modulemap -// RUN: echo " requires msvc" >> %t/InputsD/module.modulemap -// RUN: echo "}" >> %t/InputsD/module.modulemap +// RUN: echo "module RequiresWinMSVCA {" >> %t/InputsD/module.map +// RUN: echo " requires windows" >> %t/InputsD/module.map +// RUN: echo "}" >> %t/InputsD/module.map +// RUN: echo "module RequiresWinMSVCB {" >> %t/InputsD/module.map +// RUN: echo " requires windows, msvc" >> %t/InputsD/module.map +// RUN: echo "}" >> %t/InputsD/module.map +// RUN: echo "module RequiresWinMSVCC {" >> %t/InputsD/module.map +// RUN: echo " requires msvc" >> %t/InputsD/module.map +// RUN: echo "}" >> %t/InputsD/module.map // RUN: %clang_cc1 -triple=thumbv7-unknown-windows-msvc -DENABLE_WINMSVC -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -x objective-c -I%t/InputsD %s -verify #ifdef ENABLE_WINMSVC diff --git a/clang/test/Modules/validate-system-headers.m b/clang/test/Modules/validate-system-headers.m index 7599d4ed5914e..cceedb2daacb4 100644 --- a/clang/test/Modules/validate-system-headers.m +++ b/clang/test/Modules/validate-system-headers.m @@ -1,7 +1,7 @@ // RUN: rm -rf %t/ModuleCache // RUN: mkdir -p %t/Inputs/usr/include // RUN: touch %t/Inputs/usr/include/foo.h -// RUN: echo 'module Foo [system] { header "foo.h" }' > %t/Inputs/usr/include/module.modulemap +// RUN: echo 'module Foo [system] { header "foo.h" }' > %t/Inputs/usr/include/module.map //// // Build a module using a system header diff --git a/clang/test/PCH/modified-module-dependency.m b/clang/test/PCH/modified-module-dependency.m index 44c14b3a0231c..39fddb039bad6 100644 --- a/clang/test/PCH/modified-module-dependency.m +++ b/clang/test/PCH/modified-module-dependency.m @@ -2,7 +2,7 @@ // RUN: mkdir -p %t-dir // RUN: echo '@import test;' > %t-dir/prefix.h // RUN: echo 'void foo(void);' > %t-dir/test.h -// RUN: cp %S/modified-module-dependency.module.map %t-dir/module.modulemap +// RUN: cp %S/modified-module-dependency.module.map %t-dir/module.map // Precompile prefix.pch. // RUN: %clang_cc1 -x objective-c -I %t-dir -fmodules -fimplicit-module-maps -fmodules-cache-path=%t-dir/cache -fdisable-module-hash -emit-pch %t-dir/prefix.h -o %t-dir/prefix.pch diff --git a/clang/test/Preprocessor/pragma_module.c b/clang/test/Preprocessor/pragma_module.c index 2d86b989411fd..c52d42537573f 100644 --- a/clang/test/Preprocessor/pragma_module.c +++ b/clang/test/Preprocessor/pragma_module.c @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: mkdir %t -// RUN: echo 'module foo { module a {} module b {} } module bar {} module if {}' > %t/module.modulemap -// RUN: %clang_cc1 -fmodules -fmodule-name=if -x c %t/module.modulemap -emit-module -o %t/if.pcm -// RUN: %clang_cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.modulemap -// RUN: %clang_cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.modulemap -fmodules-local-submodule-visibility -DLOCAL_VIS +// RUN: echo 'module foo { module a {} module b {} } module bar {} module if {}' > %t/module.map +// RUN: %clang_cc1 -fmodules -fmodule-name=if -x c %t/module.map -emit-module -o %t/if.pcm +// RUN: %clang_cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.map +// RUN: %clang_cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.map -fmodules-local-submodule-visibility -DLOCAL_VIS // Just checking the syntax here; the semantics are tested elsewhere. #pragma clang module import // expected-error {{expected module name}} diff --git a/clang/test/SemaObjC/Inputs/module.modulemap b/clang/test/SemaObjC/Inputs/module.map similarity index 100% rename from clang/test/SemaObjC/Inputs/module.modulemap rename to clang/test/SemaObjC/Inputs/module.map diff --git a/clang/test/VFS/Inputs/vfsoverlay.yaml b/clang/test/VFS/Inputs/vfsoverlay.yaml index 25ac53ea0ac77..504a1530d3c55 100644 --- a/clang/test/VFS/Inputs/vfsoverlay.yaml +++ b/clang/test/VFS/Inputs/vfsoverlay.yaml @@ -9,7 +9,7 @@ { 'name': 'import_some_frame.h', 'type': 'file', 'external-contents': 'INPUT_DIR/import_some_frame.h' }, - { 'name': 'module.modulemap', 'type': 'file', + { 'name': 'module.map', 'type': 'file', 'external-contents': 'INPUT_DIR/actual_module.map' }, { 'name': 'include_real.h', 'type': 'file', diff --git a/clang/test/VFS/Inputs/vfsoverlay2.yaml b/clang/test/VFS/Inputs/vfsoverlay2.yaml index f6ed2710941bd..ae2a0ce4ec98f 100644 --- a/clang/test/VFS/Inputs/vfsoverlay2.yaml +++ b/clang/test/VFS/Inputs/vfsoverlay2.yaml @@ -3,7 +3,7 @@ 'roots': [ { 'name': 'OUT_DIR', 'type': 'directory', 'contents': [ - { 'name': 'module.modulemap', 'type': 'file', + { 'name': 'module.map', 'type': 'file', 'external-contents': 'INPUT_DIR/actual_module2.map' } ] diff --git a/clang/test/VFS/test_nonmodular.c b/clang/test/VFS/test_nonmodular.c index c7acb74f5eca2..faec0e3a51623 100644 --- a/clang/test/VFS/test_nonmodular.c +++ b/clang/test/VFS/test_nonmodular.c @@ -1,6 +1,6 @@ // RUN: rm -rf %t // RUN: mkdir -p %t/vdir %t/cache %t/outdir -// We can't have module.modulemap inside Inputs/Nonmodular. +// We can't have module.map inside Inputs/Nonmodular. // RUN: cp %S/Inputs/Nonmodular/Nonmodular.modulemap %t/outdir/module.modulemap // // RUN: sed -e "s@VDIR@%{/t:regex_replacement}/vdir@g" -e "s@IN_DIR@%{/S:regex_replacement}@g" -e "s@OUT_DIR@%{/t:regex_replacement}/outdir@g" %S/Inputs/Nonmodular/nonmodular-headers.yaml > %t/vdir/nonmodular-headers.yaml diff --git a/clang/unittests/Tooling/ToolingTest.cpp b/clang/unittests/Tooling/ToolingTest.cpp index b0d03928a6af4..a476a9e3b510f 100644 --- a/clang/unittests/Tooling/ToolingTest.cpp +++ b/clang/unittests/Tooling/ToolingTest.cpp @@ -197,8 +197,8 @@ TEST(ToolInvocation, TestMapVirtualFile) { TEST(ToolInvocation, TestVirtualModulesCompilation) { // FIXME: Currently, this only tests that we don't exit with an error if a - // mapped module.modulemap is found on the include path. In the future, expand - // this test to run a full modules enabled compilation, so we make sure we can + // mapped module.map is found on the include path. In the future, expand this + // test to run a full modules enabled compilation, so we make sure we can // rerun modules compilations with a virtual file system. llvm::IntrusiveRefCntPtr OverlayFileSystem( new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem())); @@ -218,9 +218,9 @@ TEST(ToolInvocation, TestVirtualModulesCompilation) { "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("#include \n")); InMemoryFileSystem->addFile("def/abc", 0, llvm::MemoryBuffer::getMemBuffer("\n")); - // Add a module.modulemap file in the include directory of our header, so we - // trigger the module.modulemap header search logic. - InMemoryFileSystem->addFile("def/module.modulemap", 0, + // Add a module.map file in the include directory of our header, so we trigger + // the module.map header search logic. + InMemoryFileSystem->addFile("def/module.map", 0, llvm::MemoryBuffer::getMemBuffer("\n")); EXPECT_TRUE(Invocation.run()); } diff --git a/lldb/test/API/lang/swift/different_clang_flags/cdeps/module.modulemap b/lldb/test/API/lang/swift/different_clang_flags/cdeps/module.map similarity index 100% rename from lldb/test/API/lang/swift/different_clang_flags/cdeps/module.modulemap rename to lldb/test/API/lang/swift/different_clang_flags/cdeps/module.map diff --git a/lldb/test/API/lang/swift/different_clang_flags/moda_dir/cdeps/module.modulemap b/lldb/test/API/lang/swift/different_clang_flags/moda_dir/cdeps/module.map similarity index 100% rename from lldb/test/API/lang/swift/different_clang_flags/moda_dir/cdeps/module.modulemap rename to lldb/test/API/lang/swift/different_clang_flags/moda_dir/cdeps/module.map diff --git a/lldb/test/API/lang/swift/different_clang_flags/modb_dir/cdeps/module.modulemap b/lldb/test/API/lang/swift/different_clang_flags/modb_dir/cdeps/module.map similarity index 100% rename from lldb/test/API/lang/swift/different_clang_flags/modb_dir/cdeps/module.modulemap rename to lldb/test/API/lang/swift/different_clang_flags/modb_dir/cdeps/module.map