cdecl99: Fix "help" command on ULTRIX.

[cdecl99.git] / tests / general.at

diff --git a/tests/general.at b/tests/general.at
index 21261ed5ddc387557c38f2a1ce53bc4b4c659be8..7b34b9d45912ee360e88d8e57b82070df4fdf93a 100644 (file)
--- a/tests/general.at
+++ b/tests/general.at
@@ -63,13 +63,33 @@ AT_CLEANUP
 
 AT_SETUP([cdecl99 help command])
 
-AT_DATA([input], [[help
+AT_DATA([input],
+[[help
 explain int
 ]])
 
-AT_CHECK([cdecl99 -f input], [0], [stdout])
-AT_CHECK([sed -n '$p' stdout], [0], [type int
-])
+# Program to generate expected output based on src/execute.gperf
+AT_DATA([expout.sed],
+[[#n
+/^%%$/,/^%%$/ {
+  s/^exit.*//
+  s/,.*//p
+}
+$a\
+type int
+]])
+sed -f expout.sed "$srcdir/src/execute.gperf" >expout
+
+# Program to filter the help output to extract the command list from "help"
+# without any descriptions.
+AT_DATA([filter.sed],
+[[/^ /,$ !d
+/^          /d
+s/^  *\([^ ]*\).*/\1/
+]])
+
+AT_CHECK([LC_ALL=C cdecl99 -f input >stdout && sed -f filter.sed stdout],
+  [0], [expout])
 
 AT_CLEANUP
 
@@ -115,7 +135,7 @@ END { exit(status); }
 ]])
 
 AT_CHECK([LC_ALL=C cdecl99 --file=input || exit 42], [42], [], [stderr])
-AT_CHECK([$AWK -v progname="$progname" -f check.awk stderr])
+AT_CHECK([$AWK -f check.awk progname="$progname" stderr])
 
 exec 3<input
 set x; shift
@@ -123,7 +143,7 @@ while read line <&3; do
   set x "$@" "--execute=$line"; shift;
 done
 AT_CHECK([LC_ALL=C cdecl99 "$@" || exit 42], [42], [], [stderr])
-AT_CHECK([$AWK -v progname="$progname" -f check.awk stderr])
+AT_CHECK([$AWK f check.awk progname="$progname" stderr])
 
 AT_CLEANUP