https://github.com/dzhidzhoev created
https://github.com/llvm/llvm-project/pull/111816
This makes tests more portable.
Environment variables for LLVM utils are passed to `make` on Darwin as well.
>From 050b000a5fe4fd517fefed1532e6cf56e2bb147b Mon Sep 17 00:00:00 2001
From: Vladimir Vereschaka <vveresch...@accesssoftek.com>
Date: Thu, 9 May 2024 03:22:15 +0000
Subject: [PATCH] [lldb][test] Use $(STRIP) instead of strip in API tests.
This allows to make tests more portable.
Environment variables for LLVM utils are passed to `make` on Darwin as
well.
---
.../Python/lldbsuite/test/builders/builder.py | 46 +++++++++----------
lldb/test/API/lang/objc/hidden-ivars/Makefile | 4 +-
.../API/lang/objc/objc-ivar-stripped/Makefile | 2 +-
.../objc/objc-static-method-stripped/Makefile | 2 +-
lldb/test/API/macosx/add-dsym/Makefile | 2 +-
lldb/test/API/tools/lldb-dap/module/Makefile | 2 +-
.../tools/lldb-dap/terminated-event/Makefile | 2 +-
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py
b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index f813d68e46e82a..d399a5b228c131 100644
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -169,31 +169,31 @@ def getToolchainUtil(util_name):
if not os.getenv("LLVM_AR"):
utils.extend(["LLVM_AR=%s" % getToolchainUtil("llvm-ar")])
- if not lldbplatformutil.platformIsDarwin():
- if cc_type in ["clang", "cc", "gcc"]:
- util_paths = {}
- # Assembly a toolchain side tool cmd based on passed CC.
- for var, name in util_names.items():
- # Do not override explicity specified tool from the cmd
line.
- if not os.getenv(var):
- util_paths[var] = getToolchainUtil("llvm-" + name)
- else:
- util_paths[var] = os.getenv(var)
- utils.extend(["AR=%s" % util_paths["ARCHIVER"]])
-
- # Look for llvm-dwp or gnu dwp
- if not lldbutil.which(util_paths["DWP"]):
- util_paths["DWP"] = getToolchainUtil("llvm-dwp")
- if not lldbutil.which(util_paths["DWP"]):
- util_paths["DWP"] = lldbutil.which("llvm-dwp")
+ if cc_type in ["clang", "cc", "gcc"]:
+ util_paths = {}
+ # Assembly a toolchain side tool cmd based on passed CC.
+ for var, name in util_names.items():
+ # Do not override explicity specified tool from the cmd line.
+ if not os.getenv(var):
+ util_paths[var] = getToolchainUtil("llvm-" + name)
+ else:
+ util_paths[var] = os.getenv(var)
+ utils.extend(["AR=%s" % util_paths["ARCHIVER"]])
+
+ # Look for llvm-dwp or gnu dwp
+ if not lldbutil.which(util_paths["DWP"]):
+ util_paths["DWP"] = getToolchainUtil("llvm-dwp")
+ if not lldbutil.which(util_paths["DWP"]):
+ util_paths["DWP"] = lldbutil.which("llvm-dwp")
+ if not util_paths["DWP"]:
+ util_paths["DWP"] = lldbutil.which("dwp")
if not util_paths["DWP"]:
- util_paths["DWP"] = lldbutil.which("dwp")
- if not util_paths["DWP"]:
- del util_paths["DWP"]
+ del util_paths["DWP"]
- for var, path in util_paths.items():
- utils.append("%s=%s" % (var, path))
- else:
+ for var, path in util_paths.items():
+ utils.append("%s=%s" % (var, path))
+
+ if lldbplatformutil.platformIsDarwin():
utils.extend(["AR=%slibtool" % os.getenv("CROSS_COMPILE", "")])
return [
diff --git a/lldb/test/API/lang/objc/hidden-ivars/Makefile
b/lldb/test/API/lang/objc/hidden-ivars/Makefile
index 283e8a118fb16a..c94c0dee1b9ce9 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 8b63215d6d9da6..eed66d2a965d11 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 ed312938c9cd11..4936553c56f7c0 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 4e1ec2202d0b09..b949b308d3acce 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/tools/lldb-dap/module/Makefile
b/lldb/test/API/tools/lldb-dap/module/Makefile
index b30baf48b972ef..c7d626a1a7e4c1 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 b30baf48b972ef..c7d626a1a7e4c1 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
