3 files changed, 12 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index f92b898ecc9..d4a65cda06a 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -188,5 +188,5 @@ def get_filecheck_path():
     """
     Get the path to the FileCheck testing tool.
     """
-    assert os.path.lexists(filecheck)
-    return filecheck
+    if os.path.lexists(filecheck):
+        return filecheck
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index ab466288669..e3a30ed5b10 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -308,11 +308,15 @@ def parseOptionsAndInitTestdirs():
           'xcrun -find -toolchain default dsymutil')
 
     if args.filecheck:
-        # The CMake build passes in a path to a working FileCheck binary.
+        # The lldb-dotest script produced by the CMake build passes in a path
+        # to a working FileCheck binary. So does one specific Xcode project
+        # target. However, when invoking dotest.py directly, a valid --filecheck
+        # option needs to be given.
         configuration.filecheck = os.path.abspath(args.filecheck)
-    else:
-        logging.error('No valid FileCheck executable; aborting...')
-        sys.exit(-1)
+
+    if not configuration.get_filecheck_path():
+        logging.warning('No valid FileCheck executable; some tests may fail...')
+        logging.warning('(Double-check the --filecheck argument to dotest.py)')
 
     if args.channels:
         lldbtest_config.channels = args.channels
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 982af9a9859..0bd72150bc7 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2237,6 +2237,8 @@ class TestBase(Base):
 
         # Run FileCheck.
         filecheck_bin = configuration.get_filecheck_path()
+        if not filecheck_bin:
+            self.assertTrue(False, "No valid FileCheck executable specified")
         filecheck_args = [filecheck_bin, check_file_abs]
         if filecheck_options:
             filecheck_args.append(filecheck_options)