Skip to content

Commit

Permalink
[lldb] Support tests with nested make invocations on Windows 1/2 (llv…
Browse files Browse the repository at this point in the history
…m#112342)

In recent PR llvm#111531 for
Windows support, we enabled tests that require the `make` tool. On
Windows, default install directories likely contain spaces, in this case
e.g. `C:\Program Files (x86)\GnuWin32\bin\make.exe`. It's typically
handled well by CMake, so that today invocations from `dotest.py` don't
cause issues. However, we also have nested invocations from a number of
Makefiles themselves. These still failed if the path to the `make` tool
contains spaces.

This patch attempts to fix the functionalities/completion test by adding
quotes in the respective Makefile. If it keeps passing on the bots, we can
roll out the fix to all affected tests.
  • Loading branch information
weliveindetail committed Nov 5, 2024
1 parent 466adcf commit c4396c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lldb/test/API/functionalities/completion/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ USE_LIBDL := 1
a.out: lib_shared

lib_shared:
$(MAKE) -f $(MAKEFILE_RULES) \
"$(MAKE)" -f $(MAKEFILE_RULES) \
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=shared.cpp DYLIB_NAME=shared

include Makefile.rules

0 comments on commit c4396c4

Please sign in to comment.