[Lldb-commits] [lldb] a4367d2 - [lldb] Support tests with nested make invocations on Windows 1/2 (#112342)

[via lldb-commits]

Author: Stefan Gränitz
Date: 2024-10-15T14:22:12+02:00
New Revision: a4367d2d136420f562f64e7731b9393fb609f3fc

URL: https://github.com/llvm/llvm-project/commit/a4367d2d136420f562f64e7731b9393fb609f3fc
DIFF: https://github.com/llvm/llvm-project/commit/a4367d2d136420f562f64e7731b9393fb609f3fc.diff

LOG: [lldb] Support tests with nested make invocations on Windows 1/2 (#112342)

In recent PR https://github.com/llvm/llvm-project/pull/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.

Added: 
    

Modified: 
    lldb/test/API/functionalities/completion/Makefile

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/functionalities/completion/Makefile b/lldb/test/API/functionalities/completion/Makefile
index f46742243bd96d..e457693f62ca44 100644
--- a/lldb/test/API/functionalities/completion/Makefile
+++ b/lldb/test/API/functionalities/completion/Makefile
@@ -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