From 16fe4796d6d51416ed9032f6c93288ecbe6b3d19 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 3 Dec 1998 11:21:28 +0000 Subject: [PATCH] old-dejagnu.exp (old-dejagnu): ignore collect recompiling and relinking messages * lib/old-dejagnu.exp (old-dejagnu): ignore collect recompiling and relinking messages * lib/g++.exp (g++_target_compile): remove .rpo file when compiling with -frepo From-SVN: r24069 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/lib/g++.exp | 6 ++++++ gcc/testsuite/lib/old-dejagnu.exp | 1 + 3 files changed, 14 insertions(+) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fac365ebb93..d7063a12ef8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +1998-12-03 Alexandre Oliva + + * lib/old-dejagnu.exp (old-dejagnu): ignore collect recompiling + and relinking messages + * lib/g++.exp (g++_target_compile): remove .rpo file when + compiling with -frepo + 1998-12-01 Alexandre Oliva * g++.old-deja/g++.pt/lookup6.C: New test. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index b0f6039544c..27b444ee8a1 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -157,6 +157,12 @@ proc g++_target_compile { source dest type options } { set options [concat $options "$ALWAYS_CXXFLAGS"]; + if { [regexp "(^| )-frepo( |$)" $options] && \ + [regexp "\.o(|bj)$" $dest] } then { + regsub "\.o(|bj)$" $dest ".rpo" rponame + exec rm -f $rponame + } + return [target_compile $source $dest $type $options] } diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp index fe566e69b19..835bb41a2c4 100644 --- a/gcc/testsuite/lib/old-dejagnu.exp +++ b/gcc/testsuite/lib/old-dejagnu.exp @@ -535,6 +535,7 @@ proc old-dejagnu { compiler prog cflagsx default_cflags libs } { regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $comp_output "" comp_output regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $comp_output "" comp_output + regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $comp_output "" comp_output set unsupported_message [${tool}_check_unsupported_p $comp_output] if { $unsupported_message != "" } { -- 2.30.2