Bump dxcommon to pull in AIX fixes.

[cdecl99.git] / tests / general.at

diff --git a/tests/general.at b/tests/general.at
index fb4ee68fdad436c33e6fac9c573f855d93ae1e4c..f73f78114f99068b31092332499889005c03907f 100644 (file)
--- a/tests/general.at
+++ b/tests/general.at
@@ -1,4 +1,4 @@
-# Copyright © 2012, 2020-2021, 2023 Nick Bowler
+# Copyright © 2012, 2020-2021, 2023-2024 Nick Bowler
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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
 
@@ -129,15 +149,13 @@ AT_CLEANUP
 
 AT_SETUP([cdecl99 invalid character error messages])
 
-$AWK -f - >test.dat <<'EOF'
-BEGIN {
+$AWK 'BEGIN {
   print "explain \1";
   print "explain \377";
   print "explain \a";
   print "explain \b";
   print "explain ?";
-}
-EOF
+}' >test.dat </dev/null
 
 AT_CHECK([LC_ALL=C cdecl99 -f test.dat || exit 42], [42], [], [stderr])
 AT_CHECK([$AWK '{ print $NF; }' stderr], [0],