From 9e0fc10b1c655320ccb63c1798141f4a572410f8 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Thu, 7 Jan 2021 09:37:32 +0100 Subject: [PATCH] testsuite: Fix test failures from outputs.exp [PR98225] The .ld1_args file is not created when HAVE_GNU_LD is false. The ltrans0.ltrans_arg file is not created when the make jobserver is available, so remove the MAKEFLAGS variable. There are no .cdtor.* files ever created with any of the tests, so remove the exception for those files. 2021-01-07 Bernd Edlinger PR testsuite/98225 * gcc.misc-tests/outputs.exp: Unset MAKEFLAGS. Expect .ld1_args only when GNU LD is used. Remove exception for .cdtor.* files. --- gcc/testsuite/gcc.misc-tests/outputs.exp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/gcc.misc-tests/outputs.exp b/gcc/testsuite/gcc.misc-tests/outputs.exp index 80d4b61..05e5b1b2 100644 --- a/gcc/testsuite/gcc.misc-tests/outputs.exp +++ b/gcc/testsuite/gcc.misc-tests/outputs.exp @@ -50,6 +50,9 @@ if !$skip_lto { set ltop [check_linker_plugin_available] } +# Check for GNU LD. Some files like .ld1_args depend on this. +set gld [check_effective_target_gld] + # Prepare additional options to be used for linking. # We do not compile to an executable, because that requires naming an output. set link_options "" @@ -67,6 +70,12 @@ if {[board_info $dest exists output_format]} { append link_options " additional_flags=-Wl,-oformat,[board_info $dest output_format]" } +# Avoid possible influence from the make jobserver, +# otherwise ltrans0.ltrans_args files may be missing. +if [info exists env(MAKEFLAGS)] { + unsetenv MAKEFLAGS +} + # For the test named TEST, run the compiler with SOURCES and OPTS, and # look in DIRS for OUTPUTS. SOURCES is a list of suffixes for source # files starting with $b in $srcdir/$subdir, OPTS is a string with @@ -130,6 +139,7 @@ proc outest { test sources opts dirs outputs } { foreach og $olist { if { [string index $og 0] == "!" } { global gspd ltop + global gld set cond [expr $og] continue } @@ -179,11 +189,7 @@ proc outest { test sources opts dirs outputs } { set outb {} foreach f $outs { file delete $f - # collect2 may create .cdtor* files in -save-temps link tests, - # ??? without regard to aux output naming conventions. - if ![string match "*.cdtor.*" $f] then { - lappend outb $f - } + lappend outb $f } foreach d $dirs { file delete -force $d @@ -285,10 +291,10 @@ outest "$b exe savetmp namedb" $sing "-o $b.exe -save-temps" {} {{--0.i --0.s -- outest "$b exe savetmp named2" $mult "-o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o .exe}} # Additional files are created when an @file is used -outest "$b exe savetmp namedb" $sing "@/dev/null -o $b.exe -save-temps" {} {{--0.i --0.s --0.o .args.0 .ld1_args .exe}} -outest "$b exe savetmp named2" $mult "@/dev/null -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o .args.0 .ld1_args .exe}} -outest "$b exe savetmp named2" $mult "@/dev/null -I dummy -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o -args.0 -args.1 .args.2 .ld1_args .exe}} -outest "$b exe savetmp named2" $mult "@/dev/null -I dummy -L dummy -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o -args.0 -args.1 .args.2 .args.3 .ld1_args .exe}} +outest "$b exe savetmp namedb" $sing "@/dev/null -o $b.exe -save-temps" {} {{--0.i --0.s --0.o .args.0 !!$gld .ld1_args !0 .exe}} +outest "$b exe savetmp named2" $mult "@/dev/null -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o .args.0 !!$gld .ld1_args !0 .exe}} +outest "$b exe savetmp named2" $mult "@/dev/null -I dummy -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o -args.0 -args.1 .args.2 !!$gld .ld1_args !0 .exe}} +outest "$b exe savetmp named2" $mult "@/dev/null -I dummy -L dummy -o $b.exe -save-temps" {} {{--1.i --1.s --1.o --2.i --2.s --2.o -args.0 -args.1 .args.2 .args.3 !!$gld .ld1_args !0 .exe}} # Setting the main output to a dir selects it as the default aux&dump # location. -- 1.9.1