test_summary (configflags): Only use the first match.

* test_summary (configflags): Only use the first match.  Remove
excess space.  Use sub instead of gsub where possible.  Use `none'
if no configure flags were given.

From-SVN: r61483

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 0cca22d2d3dae5e75f0945bdf3aa3f290d063b64..229ec5e47daf120b1b32effdf8a8576a18f972d6 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-19  Alexandre Oliva  <aoliva@redhat.com>
+
+       * test_summary (configflags): Only use the first match.  Remove
+       excess space.  Use sub instead of gsub where possible.  Use `none'
+       if no configure flags were given.
+
 2003-01-10  Loren J. Rittle  <ljrittle@acm.org>
 
        * test_summary (configflags): awk portability.

diff --git a/contrib/test_summary b/contrib/test_summary
index a56f581aa58d9bb48a3db745b09a1f7fd8618803..356d7b320acf70bf01d2fe51aa5ff64514b9f929 100755 (executable)
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -88,25 +88,28 @@ if $forcemail || $anychange; then :; else mailto=nobody; fi &&
 cat ./config.status $files |
 $AWK '
 BEGIN {
-  lang="";
+  lang=""; configflags = "";
   address="gcc-testresults@gcc.gnu.org";
   version="gcc";
   print "cat <<'"'"'EOF'"'"' |";
 '${prepend_logs+"  system(\"cat $prepend_logs\"); "}'
 }
-$0 ~ /^[^ ]*\/configure / || $0 ~ /^# [^ ]*\/configure / {
+($0 ~ /^[^ ]*\/configure / || $0 ~ /^# [^ ]*\/configure /) &&
+configflags == "" {
     configflags = $0 " ";
-    gsub(/^# /, "", configflags);
+    sub(/^# /, "", configflags);
     srcdir = configflags;
-    gsub(/\/configure .*/, "", srcdir);
+    sub(/\/configure .*/, "", srcdir);
     printf "LAST_UPDATED: ";
     system("tail -1 " srcdir "/LAST_UPDATED");
     print "";
 
-    gsub(/^[^ ]*\/configure /, "configure flags: ", configflags);
-    gsub(/ --with-gcc-version-trigger=[^ ]* /, " ", configflags);
-    gsub(/ --norecursion /, " ", configflags);
-    gsub(/ $/, "", configflags);
+    sub(/^[^ ]*\/configure */, " ", configflags);
+    sub(/ --with-gcc-version-trigger=[^ ]* /, " ", configflags);
+    sub(/ --norecursion /, " ", configflags);
+    sub(/ $/, "", configflags);
+    sub(/^ *$/, " none", configflags);
+    configflags = "configure flags:" configflags;
 }
 /^Running target / { print ""; print; }
 /^Target / { if (host != "") next; else host = $3; }