https://github.com/vvereschaka created
https://github.com/llvm/llvm-project/pull/93645
Allow passing any custom 'strip' tool, such as 'llvm-strip', to use with the
LLDB API tests.
The tool can be provided via LLDB_TEST_COMMON_ARGS_VAR CMake variable:
`..;--env STRIP=${CMAKE_STRIP};...`.
Depends on #93639
>From eb1827cd5c052d7c194e2d60faf5a81edccc27a5 Mon Sep 17 00:00:00 2001
From: Vladimir Vereschaka <vveresch...@accesssoftek.com>
Date: Tue, 28 May 2024 21:25:50 -0700
Subject: [PATCH] [lldb] Allow using a custom 'strip' tool for the API tests.
Allow passing any custom 'strip' tool, such as 'llvm-strip',
to use with the LLDB API tests.
The tool can be provided via LLDB_TEST_COMMON_ARGS_VAR CMake
variable: `..;--env STRIP=${CMAKE_STRIP};...`.
---
lldb/test/API/functionalities/json/symbol-file/Makefile | 2 +-
lldb/test/API/lang/objc/hidden-ivars/Makefile | 4 ++--
lldb/test/API/lang/objc/objc-ivar-stripped/Makefile | 2 +-
lldb/test/API/lang/objc/objc-static-method-stripped/Makefile | 2 +-
lldb/test/API/macosx/add-dsym/Makefile | 2 +-
lldb/test/API/macosx/dyld-trie-symbols/Makefile | 2 +-
lldb/test/API/tools/lldb-dap/module/Makefile | 2 +-
lldb/test/API/tools/lldb-dap/terminated-event/Makefile | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
