Merge pull request #453 from davidungar/when-testing-diags-ensure-bw

David Ungar · web-flow · commit c155e8d97829 · 2021-02-01T10:54:39.000-08:00
Add argument to ensure B&amp;W diagnostics when checking diagnostics
diff --git a/Tests/SwiftDriverTests/Helpers/AssertDiagnostics.swift b/Tests/SwiftDriverTests/Helpers/AssertDiagnostics.swift
@@ -36,8 +36,10 @@ func assertDriverDiagnostics(
   file: StaticString = #file, line: UInt = #line,
   do body: (inout Driver, DiagnosticVerifier) throws -> Void
 ) throws {
+  // Ensure there are no color codes in order to make matching work
+  let argsInBlackAndWhite = [args[0], "-no-color-diagnostics"] + args.dropFirst()
   try assertDriverDiagnostics(
-    args: args, env: env, file: file, line: line, do: body
+    args: argsInBlackAndWhite, env: env, file: file, line: line, do: body
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,10 @@ func assertDriverDiagnostics(`
`36`	`36`	`file: StaticString = #file, line: UInt = #line,`
`37`	`37`	`do body: (inout Driver, DiagnosticVerifier) throws -> Void`
`38`	`38`	`) throws {`
	`39`	`+ // Ensure there are no color codes in order to make matching work`
	`40`	`+ let argsInBlackAndWhite = [args[0], "-no-color-diagnostics"] + args.dropFirst()`
`39`	`41`	`try assertDriverDiagnostics(`
`40`		`- args: args, env: env, file: file, line: line, do: body`
	`42`	`+ args: argsInBlackAndWhite, env: env, file: file, line: line, do: body`
`41`	`43`	`)`
`42`	`44`	`}`
`43`	`45`