x86: Distinguish no PLT build and run test names

Change no PLT build and run test names from

PASS: No PLT (dynamic 1a)
...
PASS: No PLT (dynamic 1a)

to

PASS: Build no PLT (dynamic 1a)
...
PASS: Run no PLT (dynamic 1a)

in ld.log.

	* testsuite/ld-i386/no-plt.exp (run_cc_link_tests): Change
	"No PLT" to "Build no PLT" in no PLT build test names.
	(run_ld_link_exec_tests): Change "No PLT" to "Run no PLT" in no
	PLT run test names.
	* testsuite/ld-x86-64/no-plt.exp (run_cc_link_tests): Change
	"No PLT" to "Build no PLT" in no PLT build test names.
	(run_ld_link_exec_tests): Change "No PLT" to "Run no PLT" in no
	PLT run test names.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>

diff --git a/ld/testsuite/ld-i386/no-plt.exp b/ld/testsuite/ld-i386/no-plt.exp
index e0b00ba310edbab0fd7a6568575a415823f9dc8b..42f6def0dc5415c3cc18705ecca8e25ad625a9cc 100644 (file)
--- a/ld/testsuite/ld-i386/no-plt.exp
+++ b/ld/testsuite/ld-i386/no-plt.exp
@@ -72,7 +72,7 @@ run_cc_link_tests [list \
        "libno-plt-1b.so" \
     ] \
     [list \
-       "No PLT (dynamic 1a)" \
+       "Build no PLT (dynamic 1a)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o -Wl,-z,lazy" \
        "-Wa,-mx86-used-note=yes" \
@@ -81,7 +81,7 @@ run_cc_link_tests [list \
        "no-plt-1a" \
     ] \
     [list \
-       "No PLT (dynamic 1b)" \
+       "Build no PLT (dynamic 1b)" \
        "-Wl,-z,lazy tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -90,7 +90,7 @@ run_cc_link_tests [list \
        "no-plt-1b" \
     ] \
     [list \
-       "No PLT (dynamic 1c)" \
+       "Build no PLT (dynamic 1c)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so -Wl,-z,lazy" \
        "-Wa,-mx86-used-note=yes" \
@@ -99,7 +99,7 @@ run_cc_link_tests [list \
        "no-plt-1c" \
     ] \
     [list \
-       "No PLT (static 1d)" \
+       "Build no PLT (static 1d)" \
        "-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -108,7 +108,7 @@ run_cc_link_tests [list \
        "no-plt-1d" \
     ] \
     [list \
-       "No PLT (PIE 1e)" \
+       "Build no PLT (PIE 1e)" \
        "-pie -Wl,-z,lazy tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -117,7 +117,7 @@ run_cc_link_tests [list \
        "no-plt-1e" \
     ] \
     [list \
-       "No PLT (PIE 1f)" \
+       "Build no PLT (PIE 1f)" \
        "-pie -Wl,-z,lazy tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -126,7 +126,7 @@ run_cc_link_tests [list \
        "no-plt-1f" \
     ] \
     [list \
-       "No PLT (PIE 1g)" \
+       "Build no PLT (PIE 1g)" \
        "-pie -Wl,-z,lazy tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -135,7 +135,7 @@ run_cc_link_tests [list \
        "no-plt-1g" \
     ] \
     [list \
-       "No PLT (dynamic 1h)" \
+       "Build no PLT (dynamic 1h)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -144,7 +144,7 @@ run_cc_link_tests [list \
        "no-plt-1h" \
     ] \
     [list \
-       "No PLT (dynamic 1i)" \
+       "Build no PLT (dynamic 1i)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -153,7 +153,7 @@ run_cc_link_tests [list \
        "no-plt-1i" \
     ] \
     [list \
-       "No PLT (static 1j)" \
+       "Build no PLT (static 1j)" \
        "-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -165,7 +165,7 @@ run_cc_link_tests [list \
 
 run_ld_link_exec_tests [list \
     [list \
-       "No PLT (dynamic 1a)" \
+       "Run no PLT (dynamic 1a)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -174,7 +174,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1b)" \
+       "Run no PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -183,7 +183,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1c)" \
+       "Run no PLT (dynamic 1c)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -192,7 +192,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (static 1d)" \
+       "Run no PLT (static 1d)" \
        "-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -201,7 +201,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1e)" \
+       "Run no PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -210,7 +210,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1f)" \
+       "Run no PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -219,7 +219,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1g)" \
+       "Run no PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -228,7 +228,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1h)" \
+       "Run no PLT (dynamic 1h)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -237,7 +237,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1i)" \
+       "Run no PLT (dynamic 1i)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -246,7 +246,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (static 1j)" \
+       "Run no PLT (static 1j)" \
        "-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
        "-Wa,-mx86-used-note=yes" \

diff --git a/ld/testsuite/ld-x86-64/no-plt.exp b/ld/testsuite/ld-x86-64/no-plt.exp
index e78d09ad840819a725b89d6b95f69ed3895772b8..eb636700438b8ddd6ebf40fd0094a8f4b1afe8e0 100644 (file)
--- a/ld/testsuite/ld-x86-64/no-plt.exp
+++ b/ld/testsuite/ld-x86-64/no-plt.exp
@@ -70,7 +70,7 @@ run_cc_link_tests [list \
        "libno-plt-1b.so" \
     ] \
     [list \
-       "No PLT (dynamic 1a)" \
+       "Build no PLT (dynamic 1a)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -79,7 +79,7 @@ run_cc_link_tests [list \
        "no-plt-1a" \
     ] \
     [list \
-       "No PLT (dynamic 1b)" \
+       "Build no PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -88,7 +88,7 @@ run_cc_link_tests [list \
        "no-plt-1b" \
     ] \
     [list \
-       "No PLT (dynamic 1c)" \
+       "Build no PLT (dynamic 1c)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -97,7 +97,7 @@ run_cc_link_tests [list \
        "no-plt-1c" \
     ] \
     [list \
-       "No PLT (static 1d)" \
+       "Build no PLT (static 1d)" \
        "-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -106,7 +106,7 @@ run_cc_link_tests [list \
        "no-plt-1d" \
     ] \
     [list \
-       "No PLT (PIE 1e)" \
+       "Build no PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -115,7 +115,7 @@ run_cc_link_tests [list \
        "no-plt-1e" \
     ] \
     [list \
-       "No PLT (PIE 1f)" \
+       "Build no PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -124,7 +124,7 @@ run_cc_link_tests [list \
        "no-plt-1f" \
     ] \
     [list \
-       "No PLT (PIE 1g)" \
+       "Build no PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -136,7 +136,7 @@ run_cc_link_tests [list \
 
 run_ld_link_exec_tests [list \
     [list \
-       "No PLT (dynamic 1a)" \
+       "Run no PLT (dynamic 1a)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -145,7 +145,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1b)" \
+       "Run no PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -154,7 +154,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (dynamic 1c)" \
+       "Run no PLT (dynamic 1c)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -163,7 +163,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (static 1d)" \
+       "Run no PLT (static 1d)" \
        "-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -172,7 +172,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1e)" \
+       "Run no PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
        "-Wa,-mx86-used-note=yes" \
@@ -181,7 +181,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1f)" \
+       "Run no PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \
@@ -190,7 +190,7 @@ run_ld_link_exec_tests [list \
        "pass.out" \
     ] \
     [list \
-       "No PLT (PIE 1g)" \
+       "Run no PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
        "-Wa,-mx86-used-note=yes" \