Merge pull request #416 from JDevlieghere/change-reproducers-on-by-default

Change how we do default reproducer capture in the driver.

Author: JDevlieghere

lldb/lit/Reproducer/TestDriverOptions.test

@@ -1,16 +1,16 @@
 # Check that errors are propagated to the driver.
 #
-# RUN: env LLDB_REPRODUCER_DISABLE_CAPTURE=1 not %lldb --capture --capture-path %t/bogus/bogus 2>&1 | FileCheck %s --check-prefix INVALID-CAPTURE
-# RUN: env LLDB_REPRODUCER_DISABLE_CAPTURE=1 not %lldb --replay %t/bogus/bogus  2>&1 | FileCheck %s --check-prefix INVALID-REPLAY
+# 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
 
 # Check that all option combination work as expected.
 #
-# RUN: env LLDB_REPRODUCER_DISABLE_CAPTURE=1 %lldb --capture --capture-path %t.repro -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE
-# RUN: env LLDB_REPRODUCER_DISABLE_CAPTURE=1 %lldb --capture -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix NO-WARNING --check-prefix STATUS-CAPTURE
-# RUN: env LLDB_REPRODUCER_DISABLE_CAPTURE=1 %lldb --capture-path %t.repro -b -o 'reproducer status' 2>&1 | FileCheck %s --check-prefix WARNING --check-prefix STATUS-CAPTURE
+# 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

lldb/tools/driver/Driver.cpp

@@ -806,17 +806,10 @@ llvm::Optional<int> InitializeReproducer(opt::InputArgList &input_args) {
     }
     return 0;
   }
-
-  bool capture = input_args.hasArg(OPT_capture);
-  auto *capture_path = input_args.getLastArg(OPT_capture_path);
-
   // BEGIN SWIFT
-  if (!getenv("LLDB_REPRODUCER_DISABLE_CAPTURE")) {
-    // Always enable capture unless explicitly disabled by the
-    // LLDB_REPRODUCER_DISABLE_CAPTURE environment variable.
-    capture = true;
-  }
+  bool capture = true; // input_args.hasArg(OPT_capture);
   // END SWIFT
+  auto *capture_path = input_args.getLastArg(OPT_capture_path);
 
   if (capture || capture_path) {
     if (capture_path) {