Merge commit 'bd596658e84b' from swift/swift-5.2-branch into swift/master

git apple-llvm automerger · git apple-llvm automerger · commit ff71836754c0 · 2020-01-29T20:17:31.000+01:00
diff --git a/lldb/lit/Settings/command-breakpoint-col.test b/lldb/lit/Settings/command-breakpoint-col.test
@@ -1,6 +1,6 @@
 # UNSUPPORTED: system-windows
 #
-# RUN: %clang_host -g -O0 %S/Inputs/main.c -o %t.out
+# RUN: %clang -g -O0 %S/Inputs/main.c -o %t.out
 # RUN: %lldb -b -o 'help breakpoint set' -o 'breakpoint set -f main.c -l 2 -u 21' %t.out | FileCheck %s --check-prefix HELP --check-prefix CHECK
 # RUN: %lldb -b -o 'help _regexp-break' -o 'b main.c:2:21' %t.out | FileCheck %s --check-prefix HELP-REGEX --check-prefix CHECK
 # HELP: -u <column> ( --column <column> )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# UNSUPPORTED: system-windows`
`2`	`2`	`#`
`3`		`-# RUN: %clang_host -g -O0 %S/Inputs/main.c -o %t.out`
	`3`	`+# RUN: %clang -g -O0 %S/Inputs/main.c -o %t.out`
`4`	`4`	`# RUN: %lldb -b -o 'help breakpoint set' -o 'breakpoint set -f main.c -l 2 -u 21' %t.out \| FileCheck %s --check-prefix HELP --check-prefix CHECK`
`5`	`5`	`# RUN: %lldb -b -o 'help _regexp-break' -o 'b main.c:2:21' %t.out \| FileCheck %s --check-prefix HELP-REGEX --check-prefix CHECK`
`6`	`6`	`# HELP: -u <column> ( --column <column> )`