[Lldb-commits] [lldb] r370232 - [dotest] Don't try to guess the llvm binary dir.
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Wed Aug 28 10:06:29 PDT 2019
Author: jdevlieghere
Date: Wed Aug 28 10:06:28 2019
New Revision: 370232
URL: http://llvm.org/viewvc/llvm-project?rev=370232&view=rev
Log:
[dotest] Don't try to guess the llvm binary dir.
Now that all supported build systems create a valid dotest.py
invocation, we no longer need to guess the directory where any of the
llvm tools live. Additionally, the current logic is incomplete: it
doesn't try to find any other tools than FileCheck, such as dsymutil for
example.
If no FileCheck is provided, we should print a warning and skip the
tests that need it, but that's not part of this patch.
Differential revision: https://reviews.llvm.org/D66893
Modified:
lldb/trunk/packages/Python/lldbsuite/test/dotest.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=370232&r1=370231&r2=370232&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Wed Aug 28 10:06:28 2019
@@ -295,13 +295,6 @@ def parseOptionsAndInitTestdirs():
# target. However, when invoking dotest.py directly, a valid --filecheck
# option needs to be given.
configuration.filecheck = os.path.abspath(args.filecheck)
- else:
- outputPaths = get_llvm_bin_dirs()
- for outputPath in outputPaths:
- candidatePath = os.path.join(outputPath, 'FileCheck')
- if is_exe(candidatePath):
- configuration.filecheck = candidatePath
- break
if not configuration.get_filecheck_path():
logging.warning('No valid FileCheck executable; some tests may fail...')
@@ -552,34 +545,6 @@ def getOutputPaths(lldbRootDirectory):
return result
-def get_llvm_bin_dirs():
- """
- Returns an array of paths that may have the llvm/clang/etc binaries
- in them, relative to this current file.
- Returns an empty array if none are found.
- """
- result = []
-
- lldb_root_path = os.path.join(
- os.path.dirname(__file__), "..", "..", "..", "..")
- paths_to_try = [
- "llvm-build/Release+Asserts/x86_64/bin",
- "llvm-build/Debug+Asserts/x86_64/bin",
- "llvm-build/Release/x86_64/bin",
- "llvm-build/Debug/x86_64/bin",
- "llvm-build/Ninja-DebugAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-DebugAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-ReleaseAssert+asan/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert/llvm-macosx-x86_64/bin",
- "llvm-build/Ninja-RelWithDebInfoAssert+asan/llvm-macosx-x86_64/bin",
- ]
- for p in paths_to_try:
- path = os.path.join(lldb_root_path, p)
- if os.path.exists(path):
- result.append(path)
-
- return result
def setupSysPath():
"""
More information about the lldb-commits
mailing list