7 files changed, 25 insertions, 11 deletions
diff --git a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test b/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
index 370e67d12ef..8ee181e8035 100644
--- a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
+++ b/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
@@ -5,7 +5,7 @@
 # RUN: rm -rf %t.repro
 # RUN: %clangxx %S/Inputs/foo.cpp -g -o %t.out
 
-# RUN: %lldb -x -b -s %S/Inputs/DataFormatter.in --capture %t.repro %t.out | FileCheck %s
+# RUN: %lldb -x -b -s %S/Inputs/DataFormatter.in --capture --capture-path %t.repro %t.out | FileCheck %s
 # RUN: %lldb --replay %t.repro | FileCheck %s
 
 # CHECK: stop reason = breakpoint 1.1
diff --git a/lldb/lit/Reproducer/Functionalities/TestImageList.test b/lldb/lit/Reproducer/Functionalities/TestImageList.test
index fed24d1e81c..d0abae164f0 100644
--- a/lldb/lit/Reproducer/Functionalities/TestImageList.test
+++ b/lldb/lit/Reproducer/Functionalities/TestImageList.test
@@ -8,7 +8,7 @@
 # RUN: rm -rf %t.txt
 
 # RUN: echo "CAPTURE" >> %t.txt
-# RUN: %lldb -x -b  --capture %t.repro \
+# RUN: %lldb -x -b  --capture --capture-path %t.repro \
 # RUN:    -o 'run' \
 # RUN:    -o 'image list' \
 # RUN:    -o 'reproducer generate' \
diff --git a/lldb/lit/Reproducer/Functionalities/TestStepping.test b/lldb/lit/Reproducer/Functionalities/TestStepping.test
index 88c626dad4c..f43680f3e22 100644
--- a/lldb/lit/Reproducer/Functionalities/TestStepping.test
+++ b/lldb/lit/Reproducer/Functionalities/TestStepping.test
@@ -2,10 +2,11 @@
 
 # This tests that stepping continues to work when replaying a reproducer.
 
+# RUN: rm -rf %t.repro
 # RUN: %clang %S/Inputs/stepping.c -O0 -g -o %t.out
 # RUN: grep -v '#' %s > %t.in
 
-# RUN: %lldb -x -b -s %t.in --capture %t.repro %t.out | FileCheck %s --check-prefix CHECK
+# RUN: %lldb -x -b -s %t.in --capture --capture-path %t.repro %t.out | FileCheck %s --check-prefix CHECK
 # RUN: %lldb --replay %t.repro | FileCheck %s --check-prefix CHECK
 
 # Set breakpoints in a,b and c and verify we stop there when stepping.
diff --git a/lldb/lit/Reproducer/Modules/TestModuleCXX.test b/lldb/lit/Reproducer/Modules/TestModuleCXX.test
index b3a85bf5674..843c7e6d1ff 100644
--- a/lldb/lit/Reproducer/Modules/TestModuleCXX.test
+++ b/lldb/lit/Reproducer/Modules/TestModuleCXX.test
@@ -1,6 +1,7 @@
 # REQUIRES: system-darwin
 
 # Start fresh.
+# RUN: rm -rf %t.repro
 # RUN: rm -rf %t.root
 # RUN: rm -rf %t.clang-cache
 # RUN: rm -rf %t.lldb-cache
@@ -18,7 +19,7 @@
 # RUN: %clang %t.root/main.cpp -g -fmodules -fcxx-modules -fmodules-cache-path=%t.clang-cache -o %t.root/a.out
 
 # Capture the debug session.
-# RUN: %lldb -x -b -o 'settings set symbols.clang-modules-cache-path %t.lldb-cache' -s %S/Inputs/ModuleCXX.in --capture %t.repro %t.root/a.out | FileCheck %s --check-prefix CAPTURE
+# RUN: %lldb -x -b -o 'settings set symbols.clang-modules-cache-path %t.lldb-cache' -s %S/Inputs/ModuleCXX.in --capture --capture-path %t.repro %t.root/a.out | FileCheck %s --check-prefix CAPTURE
 # CAPTURE: (success = 0)
 
 # RUN: cat %t.repro/files.yaml | FileCheck %s --check-prefix YAML
diff --git a/lldb/lit/Reproducer/TestDriverOptions.test b/lldb/lit/Reproducer/TestDriverOptions.test
index c0713295685..4b5dfbf063c 100644
--- a/lldb/lit/Reproducer/TestDriverOptions.test
+++ b/lldb/lit/Reproducer/TestDriverOptions.test
@@ -1,7 +1,17 @@
 # Check that errors are propagated to the driver.
+#
+# RUN: not %lldb --capture --capture-path %t/bogus/bogus 2>&1 | FileCheck %s --check-prefix INVALID-CAPTURE
+# RUN: not %lldb --replay %t/bogus/bogus  2>&1 | FileCheck %s --check-prefix INVALID-REPLAY
+#
+# INVALID-CAPTURE: unable to create reproducer directory
+# INVALID-REPLAY: unable to load reproducer index
 
-# RUN: not %lldb --capture %t/bogus/bogus 2>&1 | FileCheck %s --check-prefix CAPTURE
-# RUN: not %lldb --replay %t/bogus/bogus  2>&1 | FileCheck %s --check-prefix REPLAY
-
-# CAPTURE: unable to create reproducer directory
-# REPLAY: unable to load reproducer index
+# Check that all option combination work as expected.
+#
+# 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
+#
+# NO-WARNING-NOT: warning: -capture-path specified without -capture
+# WARNING: warning: -capture-path specified without -capture
+# STATUS-CAPTURE: Reproducer is in capture mode.
diff --git a/lldb/lit/Reproducer/TestFileRepro.test b/lldb/lit/Reproducer/TestFileRepro.test
index 281a01a5a85..788d77b88ea 100644
--- a/lldb/lit/Reproducer/TestFileRepro.test
+++ b/lldb/lit/Reproducer/TestFileRepro.test
@@ -6,8 +6,9 @@
 # process. To ensure we're not actually running the original binary we check
 # that the string "testing" is not printed.
 
+# RUN: rm -rf %t.repro
 # RUN: %clang %S/Inputs/simple.c -g -o %t.out
-# RUN: %lldb -x -b -s %S/Inputs/FileCapture.in --capture %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
+# RUN: %lldb -x -b -s %S/Inputs/FileCapture.in --capture --capture-path %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
 # RUN: rm %t.out
 # RUN: %lldb --replay %t.repro | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
 
diff --git a/lldb/lit/Reproducer/TestGDBRemoteRepro.test b/lldb/lit/Reproducer/TestGDBRemoteRepro.test
index 6fbda6c0617..e3289025424 100644
--- a/lldb/lit/Reproducer/TestGDBRemoteRepro.test
+++ b/lldb/lit/Reproducer/TestGDBRemoteRepro.test
@@ -6,8 +6,9 @@
 # process. To ensure we're not actually running the original binary we check
 # that the string "testing" is not printed.
 
+# RUN: rm -rf %t.repro
 # RUN: %clang %S/Inputs/simple.c -g -o %t.out
-# RUN: %lldb -x -b -s %S/Inputs/GDBRemoteCapture.in --capture %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
+# RUN: %lldb -x -b -s %S/Inputs/GDBRemoteCapture.in --capture --capture-path %t.repro %t.out | FileCheck %s --check-prefix CHECK --check-prefix CAPTURE
 # RUN: %lldb --replay %t.repro | FileCheck %s --check-prefix CHECK --check-prefix REPLAY
 
 # CHECK: Breakpoint 1