additional test converage

Author: rauhul

Sources/Basics/CMakeLists.txt

@@ -53,9 +53,11 @@ add_library(Basics
   String+Extensions.swift
   SwiftVersion.swift
   SQLiteBackedCache.swift
-  Triple.swift  
+  Triple+Basics.swift
   Version+Extensions.swift
-  WritableByteStream+Extensions.swift)
+  WritableByteStream+Extensions.swift
+  Vendor/Triple.swift
+  Vendor/Triple+Platforms.swift)
 target_link_libraries(Basics PUBLIC
   SwiftCollections::DequeModule
   SwiftCollections::OrderedCollections

Sources/Basics/Triple+BasicsAPI.swift renamed to Sources/Basics/Triple+Basics.swift

@@ -975,19 +975,19 @@ extension Triple {
         return .arm(.v6k)
       case "v6kz":
         return .arm(.v6kz)
-      case "v6-m":
+      case "v6m", "v6-m":
         return .arm(.v6m)
       case "v6t2":
         return .arm(.v6t2)
-      case "v7-a":
+      case "v7a", "v7-a":
         return .arm(.v7)
       case "v7k":
         return .arm(.v7k)
-      case "v7-m":
+      case "v7m", "v7-m":
         return .arm(.v7m)
-      case "v7e-m":
+      case "v7em", "v7e-m":
         return .arm(.v7em)
-      case "v7-r":
+      case "v7r", "v7-r":
         return .arm(.v7r)
       case "v7s":
         return .arm(.v7s)

Sources/Basics/Vendor/Triple.swift

@@ -123,4 +123,40 @@ final class TripleTests: XCTestCase {
         XCTAssertTriple("mips-apple-darwin19", forPlatformVersion: "", is: "mips-apple-darwin")
         XCTAssertTriple("mips-apple-darwin19", forPlatformVersion: "22", is: "mips-apple-darwin22")
     }
+
+    func testKnownTripleParsing() {
+        func XCTAssertTriple(
+            _ triple: String,
+            matches components: (
+                arch: Triple.Arch?,
+                subArch: Triple.SubArch?,
+                vendor: Triple.Vendor?,
+                os: Triple.OS?,
+                environment: Triple.Environment?,
+                objectFormat: Triple.ObjectFormat?),
+            file: StaticString = #filePath,
+            line: UInt = #line
+        ) {
+            guard let triple = try? Triple(triple) else {
+                XCTFail(
+                    "Unknown triple '\(triple)'.",
+                    file: file,
+                    line: line)
+                return
+            }
+            XCTAssertEqual(triple.arch, components.arch, file: file, line: line)
+            XCTAssertEqual(triple.subArch, components.subArch, file: file, line: line)
+            XCTAssertEqual(triple.vendor, components.vendor, file: file, line: line)
+            XCTAssertEqual(triple.os, components.os, file: file, line: line)
+            XCTAssertEqual(triple.environment, components.environment, file: file, line: line)
+            XCTAssertEqual(triple.objectFormat, components.objectFormat, file: file, line: line)
+        }
+        XCTAssertTriple("armv7em-apple-none-eabihf-macho", matches: (.arm, .arm(.v7em), .apple, .noneOS, .eabihf, .macho))
+        XCTAssertTriple("x86_64-apple-macosx", matches: (.x86_64, nil, .apple, .macosx, nil, .macho))
+        XCTAssertTriple("x86_64-unknown-linux-gnu", matches: (.x86_64, nil, nil, .linux, .gnu, .elf))
+        XCTAssertTriple("aarch64-unknown-linux-gnu", matches: (.aarch64, nil, nil, .linux, .gnu, .elf))
+        XCTAssertTriple("aarch64-unknown-linux-android", matches: (.aarch64, nil, nil, .linux, .android, .elf))
+        XCTAssertTriple("x86_64-unknown-windows-msvc", matches: (.x86_64, nil, nil, .win32, .msvc, .coff))
+        XCTAssertTriple("wasm32-unknown-wasi", matches: (.wasm32, nil, nil, .wasi, nil, .wasm))
+    }
 }

Tests/BasicsTests/TripleTests.swift

@@ -205,7 +205,7 @@ class MiscellaneousTestCase: XCTestCase {
         #endif
         try fixture(name: "Miscellaneous/DistantFutureDeploymentTarget") { fixturePath in
             let hostTriple = try UserToolchain.default.triple
-            try executeSwiftBuild(fixturePath, Xswiftc: ["-target", "\(hostTriple.arch)-apple-macosx41.0"])
+            try executeSwiftBuild(fixturePath, Xswiftc: ["-target", "\(hostTriple.archName)-apple-macosx41.0"])
         }
     }