llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Vladislav Dzhidzhoev (dzhidzhoev) <details> <summary>Changes</summary> Use llvm-strip from llvm tools dir if no path to strip is set. Tests are changed to use cmake-provided strip. This is useful for Windows host-Linux remote testing. --- Full diff: https://github.com/llvm/llvm-project/pull/100836.diff 10 Files Affected: - (modified) lldb/packages/Python/lldbsuite/test/make/Makefile.rules (+2) - (modified) lldb/test/API/CMakeLists.txt (+5) - (modified) lldb/test/API/functionalities/json/symbol-file/Makefile (+1-1) - (modified) lldb/test/API/lang/objc/hidden-ivars/Makefile (+2-2) - (modified) lldb/test/API/lang/objc/objc-ivar-stripped/Makefile (+1-1) - (modified) lldb/test/API/lang/objc/objc-static-method-stripped/Makefile (+1-1) - (modified) lldb/test/API/macosx/add-dsym/Makefile (+1-1) - (modified) lldb/test/API/macosx/dyld-trie-symbols/Makefile (+1-1) - (modified) lldb/test/API/tools/lldb-dap/module/Makefile (+1-1) - (modified) lldb/test/API/tools/lldb-dap/terminated-event/Makefile (+1-1) ``````````diff diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index be3ad684dd736..20b76399cbbb8 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -39,6 +39,8 @@ MAKEFILE_RULES := $(lastword $(MAKEFILE_LIST)) THIS_FILE_DIR := $(shell dirname $(MAKEFILE_RULES)) LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../ +STRIP ?= strip + # The test harness invokes the test Makefiles with an explicit 'all' # target, but its handy to be able to recursively call this Makefile # without specifying a goal. You almost certainly want to build 'all', diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt index 27f285230cafa..42646484a755e 100644 --- a/lldb/test/API/CMakeLists.txt +++ b/lldb/test/API/CMakeLists.txt @@ -89,6 +89,11 @@ else() --env OBJCOPY=${LLVM_TOOLS_BINARY_DIR}/llvm-objcopy${CMAKE_EXECUTABLE_SUFFIX}) endif() +if ("${CMAKE_STRIP}" STREQUAL "") + set(CMAKE_STRIP "${LLVM_TOOLS_BINARY_DIR}/llvm-strip${CMAKE_EXECUTABLE_SUFFIX}" CACHE PATH "llvm-strip tool") +endif() +list(APPEND LLDB_TEST_COMMON_ARGS_VAR --env STRIP=${CMAKE_STRIP}) + if (NOT "${LLDB_LIT_TOOLS_DIR}" STREQUAL "") if (NOT EXISTS "${LLDB_LIT_TOOLS_DIR}") message(WARNING "LLDB_LIT_TOOLS_DIR ${LLDB_LIT_TOOLS_DIR} does not exist.") diff --git a/lldb/test/API/functionalities/json/symbol-file/Makefile b/lldb/test/API/functionalities/json/symbol-file/Makefile index aff841c364299..13bc164582eee 100644 --- a/lldb/test/API/functionalities/json/symbol-file/Makefile +++ b/lldb/test/API/functionalities/json/symbol-file/Makefile @@ -3,6 +3,6 @@ C_SOURCES := main.c all: stripped.out stripped.out : a.out - strip a.out -o stripped.out + $(STRIP) a.out -o stripped.out include Makefile.rules diff --git a/lldb/test/API/lang/objc/hidden-ivars/Makefile b/lldb/test/API/lang/objc/hidden-ivars/Makefile index 283e8a118fb16..c94c0dee1b9ce 100644 --- a/lldb/test/API/lang/objc/hidden-ivars/Makefile +++ b/lldb/test/API/lang/objc/hidden-ivars/Makefile @@ -14,8 +14,8 @@ endif stripped: a.out libInternalDefiner.dylib mkdir stripped - strip -Sx a.out -o stripped/a.out - strip -Sx libInternalDefiner.dylib -o stripped/libInternalDefiner.dylib + $(STRIP) -Sx a.out -o stripped/a.out + $(STRIP) -Sx libInternalDefiner.dylib -o stripped/libInternalDefiner.dylib ifneq "$(CODESIGN)" "" $(CODESIGN) -fs - stripped/a.out endif diff --git a/lldb/test/API/lang/objc/objc-ivar-stripped/Makefile b/lldb/test/API/lang/objc/objc-ivar-stripped/Makefile index 8b63215d6d9da..eed66d2a965d1 100644 --- a/lldb/test/API/lang/objc/objc-ivar-stripped/Makefile +++ b/lldb/test/API/lang/objc/objc-ivar-stripped/Makefile @@ -6,7 +6,7 @@ all: a.out.stripped include Makefile.rules a.out.stripped: a.out.dSYM - strip -o a.out.stripped a.out + $(STRIP) -o a.out.stripped a.out ifneq "$(CODESIGN)" "" $(CODESIGN) -fs - a.out.stripped endif diff --git a/lldb/test/API/lang/objc/objc-static-method-stripped/Makefile b/lldb/test/API/lang/objc/objc-static-method-stripped/Makefile index ed312938c9cd1..4936553c56f7c 100644 --- a/lldb/test/API/lang/objc/objc-static-method-stripped/Makefile +++ b/lldb/test/API/lang/objc/objc-static-method-stripped/Makefile @@ -4,7 +4,7 @@ LD_EXTRAS := -lobjc -framework Foundation default: a.out.stripped a.out.stripped: a.out.dSYM - strip -o a.out.stripped a.out + $(STRIP) -o a.out.stripped a.out ln -sf a.out.dSYM a.out.stripped.dSYM include Makefile.rules diff --git a/lldb/test/API/macosx/add-dsym/Makefile b/lldb/test/API/macosx/add-dsym/Makefile index 4e1ec2202d0b0..b949b308d3acc 100644 --- a/lldb/test/API/macosx/add-dsym/Makefile +++ b/lldb/test/API/macosx/add-dsym/Makefile @@ -8,7 +8,7 @@ hide.app/Contents/a.out.dSYM: mkdir hide.app mkdir hide.app/Contents mv a.out.dSYM hide.app/Contents - strip -x a.out + $(STRIP) -x a.out ifneq "$(CODESIGN)" "" $(CODESIGN) -fs - a.out endif diff --git a/lldb/test/API/macosx/dyld-trie-symbols/Makefile b/lldb/test/API/macosx/dyld-trie-symbols/Makefile index a0f3424d676cc..50938bb111483 100644 --- a/lldb/test/API/macosx/dyld-trie-symbols/Makefile +++ b/lldb/test/API/macosx/dyld-trie-symbols/Makefile @@ -10,4 +10,4 @@ all: a.out a.out-stripped a.out-stripped: cp a.out a.out-stripped - strip -N a.out-stripped + $(STRIP) -N a.out-stripped diff --git a/lldb/test/API/tools/lldb-dap/module/Makefile b/lldb/test/API/tools/lldb-dap/module/Makefile index b30baf48b972e..c7d626a1a7e4c 100644 --- a/lldb/test/API/tools/lldb-dap/module/Makefile +++ b/lldb/test/API/tools/lldb-dap/module/Makefile @@ -10,7 +10,7 @@ include Makefile.rules all: a.out.stripped a.out.stripped: - strip -o a.out.stripped a.out + $(STRIP) -o a.out.stripped a.out ifneq "$(CODESIGN)" "" $(CODESIGN) -fs - a.out.stripped diff --git a/lldb/test/API/tools/lldb-dap/terminated-event/Makefile b/lldb/test/API/tools/lldb-dap/terminated-event/Makefile index b30baf48b972e..c7d626a1a7e4c 100644 --- a/lldb/test/API/tools/lldb-dap/terminated-event/Makefile +++ b/lldb/test/API/tools/lldb-dap/terminated-event/Makefile @@ -10,7 +10,7 @@ include Makefile.rules all: a.out.stripped a.out.stripped: - strip -o a.out.stripped a.out + $(STRIP) -o a.out.stripped a.out ifneq "$(CODESIGN)" "" $(CODESIGN) -fs - a.out.stripped `````````` </details> https://github.com/llvm/llvm-project/pull/100836 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
