Rename module.map -> module.modulemap in tests

beccadax · beccadax · commit fd84e7273d33 · 2024-08-12T17:47:26.000-07:00
The legacy `module.map` spelling of module map files was deprecated by llvm/llvm-project#75142 and clang expects to remove support for them in the future. Switch all tests to use the supported spelling. Fixes rdar://128431478.
diff --git a/test/ClangImporter/AllowErrors/invalid-pcm.swift b/test/ClangImporter/AllowErrors/invalid-pcm.swift
@@ -1,10 +1,10 @@
 // RUN: %empty-directory(%t)
 // RUN: split-file %s %t
 
-// RUN: %target-swift-emit-pcm -module-name m -o %t/m.pcm -Xcc -Xclang -Xcc -fallow-pcm-with-compiler-errors -Xcc -Xclang -Xcc -fmodule-format=raw %t/mods/module.map
+// RUN: %target-swift-emit-pcm -module-name m -o %t/m.pcm -Xcc -Xclang -Xcc -fallow-pcm-with-compiler-errors -Xcc -Xclang -Xcc -fmodule-format=raw %t/mods/module.modulemap
 // RUN: %target-swift-frontend -typecheck -verify -Xcc -Xclang -Xcc -fallow-pcm-with-compiler-errors -Xcc -fmodule-file=%t/m.pcm %t/use.swift
 
-//--- mods/module.map
+//--- mods/module.modulemap
 module m {
   header "m.h"
 }
diff --git a/test/ClangImporter/Inputs/custom-modules/module.modulemap b/test/ClangImporter/Inputs/custom-modules/module.modulemap
@@ -113,8 +113,8 @@ module ImportAsMember {
   }
 }
 
-// FIXME: This probably ought to be in a module_private.map, but that causes
-// hundreds of clang warnings.
+// FIXME: This probably ought to be in a module.private.modulemap, but that
+// causes hundreds of clang warnings.
 module ImportAsMember_Private {
   export *
 
diff --git a/test/ClangImporter/Inputs/custom-modules/more-custom-modules/module.modulemap b/test/ClangImporter/Inputs/custom-modules/more-custom-modules/module.modulemap
@@ -1,4 +1,4 @@
-// It is important that this test uses a second module.map file.
+// It is important that this test uses a second module.modulemap file.
 module ImportsMissingHeaderIndirect {
   header "ImportsMissingHeaderIndirect.h"
   export *
diff --git a/test/ClangImporter/MixedSource/Inputs/resolve-cross-language/Base.modulemap b/test/ClangImporter/MixedSource/Inputs/resolve-cross-language/Base.modulemap
diff --git a/test/ClangImporter/MixedSource/resolve-cross-language.swift b/test/ClangImporter/MixedSource/resolve-cross-language.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -enable-objc-interop -emit-objc-header -o %t %S/Inputs/resolve-cross-language/Base.swift -disable-objc-attr-requires-foundation-module
-// RUN: cp %S/Inputs/resolve-cross-language/Base-module.map %t/module.modulemap
+// RUN: cp %S/Inputs/resolve-cross-language/Base.modulemap %t/module.modulemap
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %t -F %clang-importer-sdk-path/frameworks -F %S/Inputs/resolve-cross-language %s -verify
 
 import Base
diff --git a/test/Frontend/Inputs/vfs/vfsoverlay.yaml b/test/Frontend/Inputs/vfs/vfsoverlay.yaml
@@ -5,7 +5,7 @@
     {
       'name': 'OUT_DIR', 'type': 'directory',
       'contents': [
-        { 'name': 'module.map', 'type': 'file',
+        { 'name': 'module.modulemap', 'type': 'file',
           'external-contents': 'INPUT_DIR/vfs/a-modulemap'
         },
         { 'name': 'VFSMappedModule.h', 'type': 'file',
diff --git a/test/SourceKit/CursorInfo/cursor_generated_interface.swift b/test/SourceKit/CursorInfo/cursor_generated_interface.swift
@@ -46,7 +46,7 @@ public class ASwiftType {
 // CHECKA: key.modulename: "LibA"
 // CHECKA: key.decl_lang: source.lang.swift
 
-//--- frameworks/LibA.framework/module.map
+//--- frameworks/LibA.framework/Modules/module.modulemap
 framework module LibA {
   header "LibA.h"
   export *
@@ -113,7 +113,7 @@ public class CType {}
 // CHECKD: key.modulename: "LibD"
 // CHECKD: key.decl_lang: source.lang.objc
 
-//--- mods/module.map
+//--- mods/module.modulemap
 module LibD {
   header "LibD.h"
   export *
diff --git a/test/SymbolGraph/Relationships/OptionalRequirementOf.swift b/test/SymbolGraph/Relationships/OptionalRequirementOf.swift
@@ -22,7 +22,7 @@ public protocol SwiftProto {
   @objc optional func swiftReq()
 }
 
-//--- frameworks/OptionalRequirementOf.framework/module.map
+//--- frameworks/OptionalRequirementOf.framework/Modules/module.modulemap
 framework module OptionalRequirementOf {
   header "req.h"
   export *
diff --git a/test/stdlib/Inputs/ArrayBridge/module.modulemap b/test/stdlib/Inputs/ArrayBridge/module.modulemap
@@ -1,4 +1,4 @@
-//===--- module.map -------------------------------------------------------===//
+//===--- module.modulemap -------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/test/stdlib/Inputs/FoundationBridge/module.modulemap b/test/stdlib/Inputs/FoundationBridge/module.modulemap
@@ -1,4 +1,4 @@
-//===--- module.map -------------------------------------------------------===//
+//===--- module.modulemap -------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/test/stdlib/Inputs/Mirror/module.modulemap b/test/stdlib/Inputs/Mirror/module.modulemap
@@ -1,4 +1,4 @@
-//===--- module.map -------------------------------------------------------===//
+//===--- module.modulemap -------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/validation-test/Reflection/Inputs/EmptyStruct/module.modulemap b/validation-test/Reflection/Inputs/EmptyStruct/module.modulemap
diff --git a/validation-test/Reflection/Inputs/ObjCClasses/module.modulemap b/validation-test/Reflection/Inputs/ObjCClasses/module.modulemap
diff --git a/validation-test/Runtime/Inputs/class-stubs-from-objc/module.modulemap b/validation-test/Runtime/Inputs/class-stubs-from-objc/module.modulemap
diff --git a/validation-test/Runtime/Inputs/class-stubs-weak/module.modulemap b/validation-test/Runtime/Inputs/class-stubs-weak/module.modulemap
diff --git a/validation-test/Runtime/class_stubs.m b/validation-test/Runtime/class_stubs.m
@@ -4,7 +4,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -emit-library -emit-module -o %t/libfirst.dylib -emit-objc-header-path %t/first.h %S/Inputs/class-stubs-from-objc/first.swift -Xlinker -install_name -Xlinker @executable_path/libfirst.dylib -enable-library-evolution
 // RUN: %target-build-swift -emit-library -o %t/libsecond.dylib -emit-objc-header-path %t/second.h -I %t %S/Inputs/class-stubs-from-objc/second.swift -Xlinker -install_name -Xlinker @executable_path/libsecond.dylib -lfirst -L %t -target %target-next-stable-abi-triple
-// RUN: cp %S/Inputs/class-stubs-from-objc/module.map %t/
+// RUN: cp %S/Inputs/class-stubs-from-objc/module.modulemap %t/
 // RUN: xcrun -sdk %sdk %clang %s -I %t -L %t -fmodules -fobjc-arc -o %t/main -lfirst -lsecond -target %target-next-stable-abi-triple
 // RUN: %target-codesign %t/main %t/libfirst.dylib %t/libsecond.dylib
 // RUN: %target-run %t/main %t/libfirst.dylib %t/libsecond.dylib
diff --git a/validation-test/Runtime/class_stubs_weak.m b/validation-test/Runtime/class_stubs_weak.m
@@ -4,7 +4,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -emit-library -emit-module -o %t/libfirst.dylib -emit-objc-header-path %t/first.h %S/Inputs/class-stubs-weak/first.swift -Xlinker -install_name -Xlinker @executable_path/libfirst.dylib -enable-library-evolution
 // RUN: %target-build-swift -emit-library -o %t/libsecond.dylib -emit-objc-header-path %t/second.h -I %t %S/Inputs/class-stubs-weak/second.swift -Xlinker -install_name -Xlinker @executable_path/libsecond.dylib -lfirst -L %t -target %target-next-stable-abi-triple -DBEFORE
-// RUN: cp %S/Inputs/class-stubs-weak/module.map %t/
+// RUN: cp %S/Inputs/class-stubs-weak/module.modulemap %t/
 
 // Note: This is the just-built Clang, not the system Clang.
 // RUN: xcrun -sdk %sdk %clang %s -I %t -L %t -fmodules -fobjc-arc -o %t/main -lfirst -lsecond -target %target-triple

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,8 @@ module ImportAsMember {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`-// FIXME: This probably ought to be in a module_private.map, but that causes`
`117`		`-// hundreds of clang warnings.`
	`116`	`+// FIXME: This probably ought to be in a module.private.modulemap, but that`
	`117`	`+// causes hundreds of clang warnings.`
`118`	`118`	`module ImportAsMember_Private {`
`119`	`119`	`export *`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// It is important that this test uses a second module.map file.`
	`1`	`+// It is important that this test uses a second module.modulemap file.`
`2`	`2`	`module ImportsMissingHeaderIndirect {`
`3`	`3`	`header "ImportsMissingHeaderIndirect.h"`
`4`	`4`	`export *`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`'name': 'OUT_DIR', 'type': 'directory',`
`7`	`7`	`'contents': [`
`8`		`- { 'name': 'module.map', 'type': 'file',`
	`8`	`+ { 'name': 'module.modulemap', 'type': 'file',`
`9`	`9`	`'external-contents': 'INPUT_DIR/vfs/a-modulemap'`
`10`	`10`	`},`
`11`	`11`	`{ 'name': 'VFSMappedModule.h', 'type': 'file',`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public protocol SwiftProto {`
`22`	`22`	`@objc optional func swiftReq()`
`23`	`23`	`}`
`24`	`24`
`25`		`-//--- frameworks/OptionalRequirementOf.framework/module.map`
	`25`	`+//--- frameworks/OptionalRequirementOf.framework/Modules/module.modulemap`
`26`	`26`	`framework module OptionalRequirementOf {`
`27`	`27`	`header "req.h"`
`28`	`28`	`export *`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===--- module.map -------------------------------------------------------===//`
	`1`	`+//===--- module.modulemap -------------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`