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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fac365ebb93e95a70e1d17cfe6651dae598a6d78..d7063a12ef8cb36b92a60ffde716a1f9ee865e3a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * 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  <oliva@dcc.unicamp.br>
 
        * g++.old-deja/g++.pt/lookup6.C: New test.

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index b0f6039544cfcfc6d4df0e42ac6fcd69809e06f4..27b444ee8a1848e1cef66bb7f96197dcadba7853 100644 (file)
--- 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 fe566e69b19e408eb0c0bc61a2d89ca57eedeef6..835bb41a2c458c65fa80aef132fc507b305d653e 100644 (file)
--- 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 != "" } {