X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-elf%2Fcompress.exp;h=8b55f86ea9a0b580cd6c7940b3dd04e552bfdf73;hb=e2c8dab6ae8654a928ab9364d5090781a4a6f62f;hp=4a3a27841a362b424ff3018ad9d0fdba2736e0a8;hpb=716f14132a51daae1224d93f9b1be4f018112b74;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/testsuite/ld-elf/compress.exp b/ld/testsuite/ld-elf/compress.exp
index 4a3a27841a..8b55f86ea9 100644
--- a/ld/testsuite/ld-elf/compress.exp
+++ b/ld/testsuite/ld-elf/compress.exp
@@ -1,5 +1,5 @@
 # Expect script for ELF compressed debug section tests.
-#   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2010-2020 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -25,17 +25,17 @@ if ![is_elf_format] {
     return
 }
 
-# The following tests require running the executable generated by ld.
-if ![isnative] {
+# Skip targets where -shared is not supported
+
+if ![check_shared_lib_support] {
     return
 }
 
 # Check if compiler works
-if { [which $CC] == 0 } {
+if { ![check_compiler_available] } {
     return
 }
 
-global as
 if { ![ld_assemble $as "--compress-debug-sections $srcdir/$subdir/empty.s" tmpdir/empty.o ] } {
     fail "linker compressed debug sections"
 }
@@ -46,41 +46,41 @@ if { ![ld_assemble $as "--compress-debug-sections=zlib-gabi $srcdir/$subdir/empt
 
 set build_tests {
   {"Build libfoo.so with compressed debug sections"
-   "-shared" "-fPIC -g -Wa,--compress-debug-sections"
+   "-shared" "-fPIC -ggdb3 -Wa,--compress-debug-sections"
    {foo.c} {} "libfoo.so"}
   {"Build libbar.so with compressed debug sections"
    "-shared -Wl,--compress-debug-sections=none"
-   "-fPIC -g -Wa,--compress-debug-sections"
+   "-fPIC -ggdb3 -Wa,--compress-debug-sections"
    {begin.c end.c} {} "libbar.so"}
   {"Build libfoozlib.so with compressed debug sections with zlib-gabi"
-   "-shared" "-fPIC -g -Wa,--compress-debug-sections=zlib-gabi"
+   "-shared" "-fPIC -ggdb3 -Wa,--compress-debug-sections=zlib-gabi"
    {foo.c} {} "libfoozlib.so"}
   {"Build libbarzlib.so with compressed debug sections with zlib-gabi"
-   "-shared" "-fPIC -g -Wa,--compress-debug-sections=zlib-gabi"
+   "-shared" "-fPIC -ggdb3 -Wa,--compress-debug-sections=zlib-gabi"
    {begin.c end.c} {} "libbarzlib.so"}
   {"Build libzlibfoo.so with zlib compressed debug sections"
    "-shared -Wl,--compress-debug-sections=zlib"
-   "-fPIC -g -Wa,--compress-debug-sections=zlib"
+   "-fPIC -ggdb3 -Wa,--compress-debug-sections=zlib"
    {foo.c} {} "libzlibfoo.so"}
   {"Build libgnufoo.so with zlib-gnu compressed debug sections"
    "-shared -Wl,--compress-debug-sections=zlib-gnu"
-   "-fPIC -g -Wa,--compress-debug-sections=zlib-gnu"
+   "-fPIC -ggdb3 -Wa,--compress-debug-sections=zlib-gnu"
    {foo.c} {} "libgnufoo.so"}
   {"Build libgabifoo.so with zlib-gabi compressed debug sections"
    "-shared -Wl,--compress-debug-sections=zlib-gabi"
-   "-fPIC -g -Wa,--compress-debug-sections=zlib-gabi"
+   "-fPIC -ggdb3 -Wa,--compress-debug-sections=zlib-gabi"
    {foo.c} {} "libgabifoo.so"}
   {"Build zlibbegin.o with zlib compressed debug sections"
    "-r -nostdlib -Wl,--compress-debug-sections=zlib"
-   "-g -Wa,--compress-debug-sections=zlib"
+   "-ggdb3 -Wa,--compress-debug-sections=zlib"
    {begin.c} {} "zlibbegin.o"}
   {"Build gnubegin.o with zlib-gnu compressed debug sections"
    "-r -nostdlib -Wl,--compress-debug-sections=zlib-gnu"
-   "-g -Wa,--compress-debug-sections=zlib-gnu"
+   "-ggdb3 -Wa,--compress-debug-sections=zlib-gnu"
    {begin.c} {} "gnubegin.o"}
   {"Build gabiend.o with zlib-gabi compressed debug sections"
    "-r -nostdlib -Wl,--compress-debug-sections=zlib-gabi"
-   "-g -Wa,--compress-debug-sections=zlib-gnu"
+   "-ggdb3 -Wa,--compress-debug-sections=zlib-gnu"
    {end.c} {} "gabiend.o"}
 }
 
@@ -92,27 +92,27 @@ set run_tests {
      "tmpdir/begin.o tmpdir/libfoozlib.so tmpdir/end.o" ""
      {main.c} "normal" "normal.out" "-Wa,--compress-debug-sections=zlib-gabi"}
     {"Run zlibnormal with libzlibfoo.so with zlib compressed debug sections"
-     "tmpdir/begin.o tmpdir/libzlibfoo.so tmpdir/end.o --compress-debug-sections=zlib" ""
+     "tmpdir/begin.o tmpdir/libzlibfoo.so tmpdir/end.o -Wl,--compress-debug-sections=zlib" ""
      {main.c} "zlibnormal" "normal.out" "-Wa,--compress-debug-sections=zlib"}
     {"Run zlibnormal with libfoozlib.so with zlib compressed debug sections"
-     "tmpdir/begin.o tmpdir/libfoozlib.so tmpdir/end.o --compress-debug-sections=zlib" ""
+     "tmpdir/begin.o tmpdir/libfoozlib.so tmpdir/end.o -Wl,--compress-debug-sections=zlib" ""
      {main.c} "zlibnormal" "normal.out" "-Wa,--compress-debug-sections=zlib"}
     {"Run gnunormal with libgnufoo.so with zlib-gnu compressed debug sections"
-     "tmpdir/gnubegin.o tmpdir/libgnufoo.so tmpdir/end.o --compress-debug-sections=zlib-gnu" ""
+     "tmpdir/gnubegin.o tmpdir/libgnufoo.so tmpdir/end.o -Wl,--compress-debug-sections=zlib-gnu" ""
      {main.c} "gnunormal" "normal.out" "-Wa,--compress-debug-sections=zlib-gnu"}
     {"Run gnunormal with libfoozlib.so with zlib-gnu compressed debug sections"
-     "tmpdir/gnubegin.o tmpdir/libfoozlib.so tmpdir/end.o --compress-debug-sections=zlib-gnu" ""
+     "tmpdir/gnubegin.o tmpdir/libfoozlib.so tmpdir/end.o -Wl,--compress-debug-sections=zlib-gnu" ""
      {main.c} "gnunormal" "normal.out" "-Wa,--compress-debug-sections=zlib-gnu"}
     {"Run gabinormal with libgabifoo.so with zlib-gabi compressed debug sections"
-     "tmpdir/zlibbegin.o tmpdir/libgabifoo.so tmpdir/gabiend.o --compress-debug-sections=zlib-gabi" ""
+     "tmpdir/zlibbegin.o tmpdir/libgabifoo.so tmpdir/gabiend.o -Wl,--compress-debug-sections=zlib-gabi" ""
      {main.c} "gabinormal" "normal.out" "-Wa,--compress-debug-sections=zlib-gabi"}
     {"Run gabinormal with libfoozlib.so with zlib-gabi compressed debug sections"
-     "tmpdir/zlibbegin.o tmpdir/libfoozlib.so tmpdir/gabiend.o --compress-debug-sections=zlib-gabi" ""
+     "tmpdir/zlibbegin.o tmpdir/libfoozlib.so tmpdir/gabiend.o -Wl,--compress-debug-sections=zlib-gabi" ""
      {main.c} "gabinormal" "normal.out" "-Wa,--compress-debug-sections=zlib-gabi"}
 }
 
 run_cc_link_tests $build_tests
-run_ld_link_exec_tests [] $run_tests
+run_ld_link_exec_tests $run_tests
 
 set test_name "Link with zlib-gabi compressed debug input"
 send_log "cmp tmpdir/libfoo.so tmpdir/libfoozlib.so\n"
@@ -123,8 +123,6 @@ if { [catch {exec cmp tmpdir/libfoo.so tmpdir/libfoozlib.so}] } then {
     pass "$test_name"
 }
 
-global READELF
-
 set test_name "Link -r with zlib compressed debug output"
 set test zlibbegin
 send_log "$READELF -S -W tmpdir/$test.o > tmpdir/$test.out\n"
@@ -167,19 +165,19 @@ if { [regexp_diff tmpdir/$test.out $srcdir/$subdir/$test.rt] } then {
     pass "$test_name"
 }
 
-set test_name "Link with zlib compressed debug output"
+set test_name "Link with zlib compressed debug output 1"
 set test normal
 send_log "$READELF -w tmpdir/$test > tmpdir/$test.out\n"
-set got [remote_exec host "$READELF -w tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"]
+set got [remote_exec host [concat sh -c [list "$READELF -w tmpdir/$test > tmpdir/$test.out"]] "" "/dev/null"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
     send_log "$got\n"
     unresolved "$test_name"
 }
 
-set test_name "Link with zlib compressed debug output"
+set test_name "Link with zlib compressed debug output 2"
 set test zlibnormal
 send_log "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\" > tmpdir/$test.out\n"
-set got [remote_exec host "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\"" "" "/dev/null" "tmpdir/$test.out"]
+set got [remote_exec host [concat sh -c [list "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\" > tmpdir/$test.out"]] "" "/dev/null"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
     send_log "$got\n"
     unresolved "$test_name"
@@ -190,6 +188,7 @@ if { [catch {exec cmp tmpdir/normal.out tmpdir/$test.out}] } then {
 } else {
     pass "$test_name"
 }
+set test_name "Link with zlib compressed debug output 3"
 send_log "$READELF -S -W tmpdir/$test' > tmpdir/$test.out\n"
 set got [remote_exec host "$READELF -S -W tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
@@ -202,10 +201,10 @@ if { [regexp_diff tmpdir/$test.out $srcdir/$subdir/$test.rS] } then {
     pass "$test_name"
 }
 
-set test_name "Link with zlib-gnu compressed debug output"
+set test_name "Link with zlib-gnu compressed debug output 1"
 set test gnunormal
 send_log "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\" > tmpdir/$test.out\n"
-set got [remote_exec host "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\"" "" "/dev/null" "tmpdir/$test.out"]
+set got [remote_exec host [concat sh -c [list "$READELF -w tmpdir/$test | sed -e \"s/.zdebug_/.debug_/\" > tmpdir/$test.out"]] "" "/dev/null"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
     send_log "$got\n"
     unresolved "$test_name"
@@ -216,6 +215,7 @@ if { [catch {exec cmp tmpdir/normal.out tmpdir/$test.out}] } then {
 } else {
     pass "$test_name"
 }
+set test_name "Link with zlib-gnu compressed debug output 2"
 send_log "$READELF -S -W tmpdir/$test' > tmpdir/$test.out\n"
 set got [remote_exec host "$READELF -S -W tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
@@ -229,9 +229,9 @@ if { [regexp_diff tmpdir/$test.out $srcdir/$subdir/$test.rS] } then {
 }
 
 set test gabinormal
-set test_name "Link with zlib-gabi compressed debug output"
+set test_name "Link with zlib-gabi compressed debug output 1"
 send_log "$READELF -w tmpdir/$test > tmpdir/$test.out\n"
-set got [remote_exec host "$READELF -w tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"]
+set got [remote_exec host [concat sh -c [list "$READELF -w tmpdir/$test > tmpdir/$test.out"]] "" "/dev/null"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
     send_log "$got\n"
     unresolved "$test_name"
@@ -242,6 +242,7 @@ if { [catch {exec cmp tmpdir/normal.out tmpdir/$test.out}] } then {
 } else {
     pass "$test_name"
 }
+set test_name "Link with zlib-gabi compressed debug output 2"
 send_log "$READELF -t -W tmpdir/$test > tmpdir/$test.out\n"
 set got [remote_exec host "$READELF -t -W tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"]
 if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {