Avoid accidentally enabling C shims within the test target

lorentey · lorentey · commit a9219a8df8f2 · 2023-09-22T00:46:02.000-07:00
diff --git a/Package.swift b/Package.swift
@@ -86,7 +86,8 @@ let package = Package(
         "Basics/BasicAtomicUInt8Tests.swift.gyb",
         "Basics/BasicAtomicUIntTests.swift.gyb",
         "Basics/BasicAtomicUnmanagedTests.swift.gyb",
-      ]
+      ],
+      swiftSettings: _swiftSettings
     ),
   ]
 )
diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift
@@ -80,7 +80,8 @@ let package = Package(
         "Basics/BasicAtomicUInt8Tests.swift.gyb",
         "Basics/BasicAtomicUIntTests.swift.gyb",
         "Basics/BasicAtomicUnmanagedTests.swift.gyb",
-      ]
+      ],
+      swiftSettings: _swiftSettings
     ),
   ]
 )
diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift
@@ -80,7 +80,8 @@ let package = Package(
         "Basics/BasicAtomicUInt8Tests.swift.gyb",
         "Basics/BasicAtomicUIntTests.swift.gyb",
         "Basics/BasicAtomicUnmanagedTests.swift.gyb",
-      ]
+      ],
+      swiftSettings: _swiftSettings
     ),
   ]
 )
diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift
@@ -80,7 +80,8 @@ let package = Package(
         "Basics/BasicAtomicUInt8Tests.swift.gyb",
         "Basics/BasicAtomicUIntTests.swift.gyb",
         "Basics/BasicAtomicUnmanagedTests.swift.gyb",
-      ]
+      ],
+      swiftSettings: _swiftSettings
     ),
   ]
 )
diff --git a/Xcode/Atomics.xcconfig b/Xcode/Atomics.xcconfig
@@ -29,7 +29,6 @@ DYLIB_COMPATIBILITY_VERSION = $(CURRENT_PROJECT_VERSION)
 DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)
 
 OTHER_SWIFT_FLAGS = $(inherited) -enable-experimental-feature BuiltinModule
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) ATOMICS_SINGLE_MODULE=1 ATOMICS_NATIVE_BUILTINS=1
 
 INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
 SKIP_INSTALL = YES
diff --git a/Xcode/Shared.xcconfig b/Xcode/Shared.xcconfig
@@ -15,6 +15,7 @@ SWIFT_VERSION = 5.5
 ONLY_ACTIVE_ARCH[config=Debug] = YES
 
 SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) ATOMICS_SINGLE_MODULE ATOMICS_NATIVE_BUILTINS
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) ATOMICS_SINGLE_MODULE=1 ATOMICS_NATIVE_BUILTINS=1
 
 SWIFT_COMPILATION_MODE[config=Release] = wholemodule
 SWIFT_COMPILATION_MODE[config=Debug] = singlefile

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ let package = Package(`
`86`	`86`	`"Basics/BasicAtomicUInt8Tests.swift.gyb",`
`87`	`87`	`"Basics/BasicAtomicUIntTests.swift.gyb",`
`88`	`88`	`"Basics/BasicAtomicUnmanagedTests.swift.gyb",`
`89`		`- ]`
	`89`	`+ ],`
	`90`	`+ swiftSettings: _swiftSettings`
`90`	`91`	`),`
`91`	`92`	`]`
`92`	`93`	`)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ let package = Package(`
`80`	`80`	`"Basics/BasicAtomicUInt8Tests.swift.gyb",`
`81`	`81`	`"Basics/BasicAtomicUIntTests.swift.gyb",`
`82`	`82`	`"Basics/BasicAtomicUnmanagedTests.swift.gyb",`
`83`		`- ]`
	`83`	`+ ],`
	`84`	`+ swiftSettings: _swiftSettings`
`84`	`85`	`),`
`85`	`86`	`]`
`86`	`87`	`)`