Fix fixtures

Author: FranzBusch

Fixtures/Traits/Example/Sources/Example/Example.swift

@@ -1,53 +1,53 @@
-#if TRAIT_Package1
+#if Package1
 import Package1Library1
 #endif
-#if TRAIT_Package2
+#if Package2
 import Package2Library1
 #endif
-#if TRAIT_Package3
+#if Package3
 import Package3Library1
 #endif
-#if TRAIT_Package4
+#if Package4
 import Package4Library1
 #endif
-#if TRAIT_Package5
+#if Package5
 import Package5Library1
 #endif
-#if TRAIT_Package7
+#if Package7
 import Package7Library1
 #endif
-#if TRAIT_Package9
+#if Package9
 import Package9Library1
 #endif
-#if TRAIT_Package10
+#if Package10
 import Package10Library1
 #endif
 
 @main
 struct Example {
     static func main() {
-        #if TRAIT_Package1
+        #if Package1
         Package1Library1.hello()
         #endif
-        #if TRAIT_Package2
+        #if Package2
         Package2Library1.hello()
         #endif
-        #if TRAIT_Package3
+        #if Package3
         Package3Library1.hello()
         #endif
-        #if TRAIT_Package4
+        #if Package4
         Package4Library1.hello()
         #endif
-        #if TRAIT_Package5
+        #if Package5
         Package5Library1.hello()
         #endif
-        #if TRAIT_Package7
+        #if Package7
         Package7Library1.hello()
         #endif
-        #if TRAIT_Package9
+        #if Package9
         Package9Library1.hello()
         #endif
-        #if TRAIT_Package10
+        #if Package10
         Package10Library1.hello()
         #endif
         #if DEFINE1

Fixtures/Traits/Package1/Sources/Package1Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package1Trait1
+    #if Package1Trait1
     print("Package1Library1 trait1 enabled")
     #else
     print("Package1Library1 trait1 disabled")

Fixtures/Traits/Package10/Sources/Package10Library1/Library.swift

@@ -1,10 +1,10 @@
 public func hello() {
-    #if TRAIT_Package10Trait1
+    #if Package10Trait1
     print("Package10Library1 trait1 enabled")
     #else
     print("Package10Library1 trait1 disabled")
     #endif
-    #if TRAIT_Package10Trait2
+    #if Package10Trait2
     print("Package10Library1 trait2 enabled")
     #else
     print("Package10Library1 trait2 disabled")

Fixtures/Traits/Package2/Sources/Package2Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package2Trait2
+    #if Package2Trait2
     print("Package2Library1 trait2 enabled")
     #else
     print("Package2Library1 trait2 disabled")

Fixtures/Traits/Package3/Sources/Package3Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package3Trait3
+    #if Package3Trait3
     print("Package3Library1 trait3 enabled")
     #else
     print("Package3Library1 trait3 disabled")

Fixtures/Traits/Package4/Sources/Package4Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package4Trait1
+    #if Package4Trait1
     print("Package4Library1 trait1 enabled")
     #else
     print("Package4Library1 trait1 disabled")

Fixtures/Traits/Package5/Sources/Package5Library1/Library.swift

@@ -1,9 +1,9 @@
-#if TRAIT_Package5Trait1
+#if Package5Trait1
 import Package6Library1
 #endif
 
 public func hello() {
-    #if TRAIT_Package5Trait1
+    #if Package5Trait1
     print("Package5Library1 trait1 enabled")
     Package6Library1.hello()
     #else

Fixtures/Traits/Package6/Sources/Package6Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package6Trait1
+    #if Package6Trait1
     print("Package6Library1 trait1 enabled")
     #else
     print("Package6Library1 trait1 disabled")

Fixtures/Traits/Package7/Sources/Package7Library1/Library.swift

@@ -1,9 +1,9 @@
-#if TRAIT_Package7Trait1
+#if Package7Trait1
 import Package8Library1
 #endif
 
 public func hello() {
-    #if TRAIT_Package7Trait1
+    #if Package7Trait1
     print("Package7Library1 trait1 enabled")
     Package8Library1.hello()
     #else

Fixtures/Traits/Package8/Sources/Package6Library1/Library.swift

@@ -1,5 +1,5 @@
 public func hello() {
-    #if TRAIT_Package8Trait1
+    #if Package8Trait1
     print("Package8Library1 trait1 enabled")
     #else
     print("Package8Library1 trait1 disabled")

Tests/FunctionalTests/TraitTests.swift

@@ -9,7 +9,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-
+#if compiler(>=6.0)
 import DriverSupport
 import SPMTestSupport
 import PackageModel
@@ -32,3 +32,4 @@ final class TraitTests: XCTestCase {
         }
     }
 }
+#endif