From: Nick Clifton <nickc@redhat.com>
Date: Thu, 1 Jul 2021 13:10:38 +0000 (+0100)
Subject: Partially fix debuginfod tests in binutils testsuite.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b8d1f5f3861c04070bd5d249855b575e431f56b;p=binutils-gdb.git

Partially fix debuginfod tests in binutils testsuite.

	PR 28029
	* testsuite/binutils-all/debuginfod.exp: Replace -wK with -wk.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7e1e2970dbd..f6d6ebf667d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR 28029
+	* testsuite/binutils-all/debuginfod.exp: Replace -wK with -wk.
+
 2021-07-01  Andrei Homescu  <ah@immunant.com>
 
 	* readelf.c (process_archive): Reset file position to the
diff --git a/binutils/testsuite/binutils-all/debuginfod.exp b/binutils/testsuite/binutils-all/debuginfod.exp
index de8b7b3e1ce..17fedb97340 100644
--- a/binutils/testsuite/binutils-all/debuginfod.exp
+++ b/binutils/testsuite/binutils-all/debuginfod.exp
@@ -44,7 +44,7 @@ if { [which $OBJDUMP] == 0} {
 
 # Compile testprog.c, move the debuginfo to a separate file and add .gnu_debuglink.
 if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog executable debug] != ""} {
-    fail "$test (compilation failed)"
+    unsupported "$test (compilation failed)"
     return
 }
 
@@ -93,8 +93,8 @@ file delete -force $db
 # To check this we attempt to follow a broken debuglink. If configured
 # with debuginfod the output will contain the debuginfod URLs that were
 # queried (these queries fail since the server is not yet running).
-set conf_objdump [binutils_run $OBJDUMP "-WK tmpdir/testprog"]
-set conf_readelf [binutils_run $READELF "-wK tmpdir/testprog"]
+set conf_objdump [binutils_run $OBJDUMP "-Wk tmpdir/testprog"]
+set conf_readelf [binutils_run $READELF "-wk tmpdir/testprog"]
 
 # Find an unused port
 set port 7999
@@ -185,14 +185,14 @@ proc test_fetch_debugaltlink { prog progargs } {
 
 if { [regexp ".*DEBUGINFOD.*" $conf_objdump] } {
     test_fetch_debuglink $OBJDUMP "-W"
-    test_fetch_debugaltlink $OBJDUMP "-WK"
+    test_fetch_debugaltlink $OBJDUMP "-Wk"
 } else {
     untested "$test (objdump not configured with debuginfod)"
 }
 
 if { [regexp ".*DEBUGINFOD.*" $conf_readelf] } {
     test_fetch_debuglink $READELF "-w"
-    test_fetch_debugaltlink $READELF "-wK"
+    test_fetch_debugaltlink $READELF "-wk"
 } else {
     untested "$test (readelf not configured with debuginfod)"
 }