commit 07d96b34b0d83aee8c4f7a16f90a1e2a63db825c
author Wu Yingcong <yingcong.wu@intel.com> Thu Oct 02 07:42:43 2025 +0800
committer Copybara-Service <copybara-worker@google.com> Wed Oct 01 16:45:29 2025 -0700
tree 230201e9cb4a24d57398a0514a6a4b15e8a59ed9
parent a5ed5b5f1261e85adc3eda266e949143d8f454da

[libunwind][test] Add check for objcopy to improve test compatibility (#161112)

Previously, we only used `objcopy`, which is not available for some
build configurations. With this patch, we not only try to use `objcopy`,
but also try to use `llvm-objcopy` if available.

This is a follow-up of https://github.com/llvm/llvm-project/pull/156383.

GitOrigin-RevId: 4aaf6d1b8cc655f37a1a4ab8f7a7988dbef4eeae

test/configs/cmake-bridge.cfg.in

diff --git a/test/configs/cmake-bridge.cfg.in b/test/configs/cmake-bridge.cfg.in
index b804c21..e40497b 100644
--- a/test/configs/cmake-bridge.cfg.in
+++ b/test/configs/cmake-bridge.cfg.in
@@ -14,6 +14,7 @@
 import os, site
 site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
 import libcxx.test.format
+from lit.util import which
 
 # Basic configuration of the test suite
 config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
@@ -33,3 +34,13 @@
 config.substitutions.append(('%{include}', '@LIBUNWIND_TESTING_INSTALL_PREFIX@/include'))
 config.substitutions.append(('%{lib}', '@LIBUNWIND_TESTING_INSTALL_PREFIX@/@LIBUNWIND_INSTALL_LIBRARY_DIR@'))
 config.substitutions.append(('%{benchmark_flags}', ''))
+
+# Check for objcopy tools
+objcopy_path = which('llvm-objcopy', '@LLVM_BUILD_BINARY_DIR@/bin')
+if not objcopy_path:
+    objcopy_path = which('llvm-objcopy')
+if not objcopy_path:
+    objcopy_path = which('objcopy')
+if objcopy_path:
+    config.substitutions.append(('%{objcopy}', objcopy_path))
+    config.available_features.add('objcopy-available')

test/eh_frame_fde_pc_range.pass.cpp

diff --git a/test/eh_frame_fde_pc_range.pass.cpp b/test/eh_frame_fde_pc_range.pass.cpp
index 39c8e80..852612b 100644
--- a/test/eh_frame_fde_pc_range.pass.cpp
+++ b/test/eh_frame_fde_pc_range.pass.cpp
@@ -14,16 +14,15 @@
 // clang-format off
 
 // REQUIRES: target={{x86_64-.+-linux-gnu}}
-// aarch64,arm have a cross toolchain build(llvm-clang-win-x-aarch64, etc)
-// where objdump is not available.
+// REQUIRES: objcopy-available
 
 // TODO: Figure out why this fails with Memory Sanitizer.
 // XFAIL: msan
 
 // RUN: %{build}
-// RUN: objcopy --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe
+// RUN: %{objcopy} --dump-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe
 // RUN: echo -ne '\xFF' | dd of=%t_ehf_hdr.bin bs=1 seek=2 count=2 conv=notrunc status=none 
-// RUN: objcopy --update-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe
+// RUN: %{objcopy} --update-section .eh_frame_hdr=%t_ehf_hdr.bin %t.exe
 // RUN: %{exec} %t.exe
 
 // clang-format on