[lldb] Fix finding make tool for tests

[DavidSpickett]

Fixes 0e91323 / #111531

For reasons I can't explain, a clean build works fine for me, and all the bots are working fine. But if I rebuild in some way the make tool becomes None.

Looking at the other variables, they had these extra lines so I've added those for make and it seems to solve the problem.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: David Spickett (DavidSpickett)

Changes

Fixes 0e91323 / #111531

For reasons I can't explain, a clean build works fine for me, and all the bots are working fine. But if I rebuild in some way the make tool becomes None.

Looking at the other variables, they had these extra lines so I've added those for make and it seems to solve the problem.

---

Full diff: https://github.com/llvm/llvm-project/pull/111980.diff

2 Files Affected:

• (modified) lldb/utils/lldb-dotest/CMakeLists.txt (+1)
• (modified) lldb/utils/lldb-dotest/lldb-dotest.in (+2)

diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt
index bb17a2ce017d5d..3b8c88b6dc78cb 100644
--- a/lldb/utils/lldb-dotest/CMakeLists.txt
+++ b/lldb/utils/lldb-dotest/CMakeLists.txt
@@ -34,6 +34,7 @@ set(vars
   LLDB_TEST_EXECUTABLE
   LLDB_TEST_COMPILER
   LLDB_TEST_DSYMUTIL
+  LLDB_TEST_MAKE
   LLDB_LIBS_DIR
   LLVM_TOOLS_DIR
   LIBCXX_LIBRARY_DIR
diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in
index 0e9648a6e6dc83..f20859e87b1e0b 100755
--- a/lldb/utils/lldb-dotest/lldb-dotest.in
+++ b/lldb/utils/lldb-dotest/lldb-dotest.in
@@ -9,6 +9,7 @@ arch = '@LLDB_TEST_ARCH@'
 executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
 compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
 dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@'
+make = '@LLDB_TEST_MAKE_CONFIGURED@'
 lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@'
 lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@"
 lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
@@ -35,6 +36,7 @@ if __name__ == '__main__':
     cmd.extend(['--executable', executable])
     cmd.extend(['--compiler', compiler])
     cmd.extend(['--dsymutil', dsymutil])
+    cmd.extend(['--make', make])
     cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
     cmd.extend(['--llvm-tools-dir', llvm_tools_dir])
     if has_libcxx:

[DavidSpickett]

Putting this in review because I've zero idea why this fixes it. Without it I get this on a rebuild:

Traceback (most recent call last):
  File "/home/david.spickett/llvm-project/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py", line 67, in test_reverse_continue_skip_breakpoint_async
    self.reverse_continue_skip_breakpoint_internal(async_mode=True)
  File "/home/david.spickett/llvm-project/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py", line 70, in reverse_continue_skip_breakpoint_internal
    target, process, initial_threads = self.setup_recording(async_mode)
  File "/home/david.spickett/llvm-project/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py", line 94, in setup_recording
    self.build()
  File "/home/david.spickett/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 1496, in build
    self.runBuildCommand(command)
  File "/home/david.spickett/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 1501, in runBuildCommand
    output = check_output(command, stderr=STDOUT, errors="replace")
  File "/usr/lib/python3.10/subprocess.py", line 421, in check_output
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
  File "/usr/lib/python3.10/subprocess.py", line 503, in run
    with Popen(*popenargs, **kwargs) as process:
  File "/usr/lib/python3.10/subprocess.py", line 971, in __init__
    self._execute_child(args, executable, preexec_fn, close_fds,
  File "/usr/lib/python3.10/subprocess.py", line 1738, in _execute_child
    and os.path.dirname(executable)
  File "/usr/lib/python3.10/posixpath.py", line 152, in dirname
    p = os.fspath(p)
TypeError: expected str, bytes or os.PathLike object, not NoneType
Config=aarch64-/home/david.spickett/build-llvm-aarch64/bin/clang

Because the make passed in command is actually None. Perhaps the cache isn't read properly after the first configuration?

[weliveindetail]

Interesting! Your changes look fine, as they are symmetric with what we do here for dsymutil. I just wonder why I didn't hit that. Is this a separate test driver for Linux?

[DavidSpickett]

I don't think so, it's used to generate dotest.py on all platforms I think. Perhaps my cmake is being strict / less strict? The funny thing is, I can see LLDB_TEST_MAKE set in the cache even when the build breaks.

[labath]

lldb-dotest is a separate tool, which is usually only invoked manually when debugging a specific test (and not invoked by make check-lldb like the bots do). This fact that its args need to stay in sync is annoying an a relatively common problem. I feel that there must be a way to have a single source of truth for the testing args, but I haven't found the time to figure one out yet (patches welcome).