* test_summary: In generated script, use cat <<'EOF' not cat <<\EOF.

	Elide --with-gcc-version-trigger and --norecursion from
	configure flags.  Remove code to report status of haifa scheduler.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34387 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index abc383ec16aea37b95c50083cc053318ba605121..9a5987249faa3e00b2f859f3853ae3e838fb9eef 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * test_summary: In generated script, use cat <<'EOF' not cat <<\EOF.
+       Elide --with-gcc-version-trigger and --norecursion from
+       configure flags.  Remove code to report status of haifa scheduler.
+
 2000-05-18  Alexandre Oliva  <aoliva@cygnus.com>
 
        * gcc_update (self): Set to `$0'.

diff --git a/contrib/test_summary b/contrib/test_summary
index 7a621b7b55a8a01aa02e35d0075f47ac68757e19..ad08c8975669199553be18fe679f17030665986a 100755 (executable)
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# (C) 1998-1999 Free Software Foundation
+# (C) 1998, 1999, 2000 Free Software Foundation
 # Originally by Alexandre Oliva <oliva@dcc.unicamp.br>
 
 # This script is Free Software, and it can be copied, distributed and
@@ -87,10 +87,14 @@ BEGIN {
   lang="";
   address="gcc-testresults@gcc.gnu.org";
   version="gcc";
-  print "cat <<\EOF |";
+  print "cat <<'"'"'EOF'"'"' |";
 '${prepend_logs+"  system(\"cat $prepend_logs\"); "}'
 }
-$1 ~ /\/configure$/ { $1 = "configure flags:"; configflags = $0 }
+$1 ~ /\/configure$/ {
+    $1 = "configure flags:"; configflags = $0;
+    gsub(/--with-gcc-version-trigger=[^ ]* /, "", configflags);
+    gsub(/ --norecursion/, "", configflags)
+}
 /^Running target / { print ""; print; }
 /^Target / { if (host != "") next; else host = $3; }
 /^Host / && host ~ /^unix\{.*\}$/ { host = $3 " " substr(host, 5); }
@@ -98,8 +102,6 @@ $1 ~ /\/configure$/ { $1 = "configure flags:"; configflags = $0 }
 /^[    ]*=== [^        ]+ tests ===/ {
   if (lang == "") lang = " "$2" "; else lang = " ";
 }
-/--disable-haifa/ { prefix="haifa-disabled "; }
-/--enable-haifa/ { prefix="haifa-enabled "; }
 $2 == "version" { save = $0; $1 = ""; $2 = ""; version = $0; gsub(/^ */, "", version); gsub(/\r$/, "", version); $0 = save; }
 /\===.*Summary/ { print ""; print; blanks=1; }
 /tests ===/ || /^(Target|Host|Native)/ || $2 == "version" { print; blanks=1; }