Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit 1a7fb00debbc · 2019-08-29T11:24:13.000-07:00
diff --git a/test/Frontend/dump-parse.swift b/test/Frontend/dump-parse.swift
@@ -1,4 +1,4 @@
-// RUN: not %target-swift-frontend -dump-parse %s 2>&1 | %FileCheck %s
+// RUN: not %target-swift-frontend -dump-parse %s | %FileCheck %s
 // RUN: not %target-swift-frontend -dump-ast %s | %FileCheck %s -check-prefix=CHECK-AST
 
 // CHECK-LABEL: (func_decl{{.*}}"foo(_:)"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: not %target-swift-frontend -dump-parse %s 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: not %target-swift-frontend -dump-parse %s \| %FileCheck %s`
`2`	`2`	`// RUN: not %target-swift-frontend -dump-ast %s \| %FileCheck %s -check-prefix=CHECK-AST`
`3`	`3`
`4`	`4`	`// CHECK-LABEL: (func_decl{{.*}}"foo(_:)"`