Merge pull request #435 from vedantk/swift/master

vedantk · web-flow · commit 86014b200d07 · 2019-12-09T13:11:39.000-07:00
Fix Reproducer/TestDriverOptions.test in swift/master
diff --git a/lldb/lit/Reproducer/TestDriverOptions.test b/lldb/lit/Reproducer/TestDriverOptions.test
@@ -10,7 +10,10 @@
 #
 # RUN: %lldb --capture --capture-path %t.repro -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE
 # RUN: %lldb --capture -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE
-# RUN: %lldb --capture-path %t.repro -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix WARNING --check-prefix STATUS-CAPTURE
+#
+# BEGIN SWIFT-LLDB CHANGE (--capture does not need to be specified, as it's on by default)
+# RUN: %lldb --capture-path %t.repro -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE
+# END SWIFT-LLDB-CHANGE
 #
 # NO-WARNING-NOT: warning: -capture-path specified without -capture
 # WARNING: warning: -capture-path specified without -capture

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,10 @@`
`10`	`10`	`#`
`11`	`11`	`# RUN: %lldb --capture --capture-path %t.repro -b -o 'reproducer status' 2>&1 \| FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE`
`12`	`12`	`# RUN: %lldb --capture -b -o 'reproducer status' 2>&1 \| FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE`
`13`		`-# RUN: %lldb --capture-path %t.repro -b -o 'reproducer status' 2>&1 \| FileCheck %s --check-prefix WARNING --check-prefix STATUS-CAPTURE`
	`13`	`+#`
	`14`	`+# BEGIN SWIFT-LLDB CHANGE (--capture does not need to be specified, as it's on by default)`
	`15`	`+# RUN: %lldb --capture-path %t.repro -b -o 'reproducer status' 2>&1 \| FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE`
	`16`	`+# END SWIFT-LLDB-CHANGE`
`14`	`17`	`#`
`15`	`18`	`# NO-WARNING-NOT: warning: -capture-path specified without -capture`
`16`	`19`	`# WARNING: warning: -capture-path specified without -capture`