* tests/stty/basic-1: Work around an intermittent test failure

on HP-UX 11.11.  Report and analysis from Bob Proulx.
http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/7475

diff --git a/ChangeLog b/ChangeLog
index 88f6476..eba7d53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-30  Jim Meyering  <jim@meyering.net>
+
+       * tests/stty/basic-1: Work around an intermittent test failure
+       on HP-UX 11.11.  Report and analysis from Bob Proulx.
+       http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/7475
+
 2006-06-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        * NEWS: Support obsolete usages like "sort +1 -2" even when

diff --git a/tests/stty/basic-1 b/tests/stty/basic-1
index c53410f..8cdc459 100755 (executable)
--- a/tests/stty/basic-1
+++ b/tests/stty/basic-1
@@ -38,7 +38,10 @@ stty -raw -F no/such/file 2>/dev/null && fail=1
 stty -raw -a 2>/dev/null && fail=1
 
 # Build a list of all boolean options stty accepts on this system.
-options=`stty -a|tail -n +2|tr ';' '\n'|sed '/ = /d;s/^ //;s/-//g'`
+# Don't depend on terminal width.  Put each option on its own line,
+# remove all non-boolean ones, then remove any leading hyphens.
+sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d'
+options=`stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g"`
 
 # Take them one at a time, with and without the leading `-'.
 for opt in $options; do