[1/2] ld: Run --wrap tests only if supported

Message ID 20240508132220.3809117-1-hjl.tools@gmail.com
State New
Headers
Series [1/2] ld: Run --wrap tests only if supported |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 fail Patch failed to apply

Commit Message

H.J. Lu May 8, 2024, 1:22 p.m. UTC
  Run --wrap tests with shared library only if -shared is supported.

	* testsuite/ld-elf/wrap.exp: Run --wrap tests with shared library
	only if -shared is supported.
---
 ld/testsuite/ld-elf/wrap.exp | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)
  

Patch

diff --git a/ld/testsuite/ld-elf/wrap.exp b/ld/testsuite/ld-elf/wrap.exp
index d24c1e7d7ce..90e2d60e67d 100644
--- a/ld/testsuite/ld-elf/wrap.exp
+++ b/ld/testsuite/ld-elf/wrap.exp
@@ -25,34 +25,30 @@  if ![is_elf_format] {
     return
 }
 
-# Skip targets where -shared is not supported
-
-if ![check_shared_lib_support] {
-    return
-}
-
 # Check if compiler works
 if { ![check_compiler_available] } {
     return
 }
 
-set build_tests {
-  {"Build libwrap1a.so"
-   "-shared" "-fPIC"
-   {wrap1a.c} {} "libwrap1a.so"}
-  {"Build libwrap1b.so"
-   "-shared tmpdir/libwrap1a.so" "-fPIC"
-   {wrap1b.c} {} "libwrap1b.so"}
-}
-
-set run_tests {
+if [check_shared_lib_support] {
+  set build_tests {
+    {"Build libwrap1a.so"
+     "-shared" "-fPIC"
+     {wrap1a.c} {} "libwrap1a.so"}
+    {"Build libwrap1b.so"
+     "-shared tmpdir/libwrap1a.so" "-fPIC"
+     {wrap1b.c} {} "libwrap1b.so"}
+  }
+
+  set run_tests {
     {"Run with libwrap1a.so and libwrap1b.so"
      "-Wl,--no-as-needed,--wrap,par tmpdir/libwrap1a.so tmpdir/libwrap1b.so" ""
      {wrap1.c} "wrap1" "wrap1.out"}
     {"Run with libwrap1b.so and libwrap1a.so"
      "-Wl,--no-as-needed,--wrap,par tmpdir/libwrap1b.so tmpdir/libwrap1a.so" ""
      {wrap1.c} "wrap1" "wrap1.out"}
-}
+  }
 
-run_cc_link_tests $build_tests
-run_ld_link_exec_tests $run_tests
+  run_cc_link_tests $build_tests
+  run_ld_link_exec_tests $run_tests
+}