X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f0c1e306132c731c95969b6ef653101702d0678f..fed6418a32d3b0fd6036d169bd325c1172b391b5:/tests/stress.at

diff --git a/tests/stress.at b/tests/stress.at
index 9bc84cf..1426062 100644
--- a/tests/stress.at
+++ b/tests/stress.at
@@ -16,14 +16,8 @@
 AT_BANNER([Randomized tests])
 
 dnl Verify the RNG implementation
-AT_SETUP([xoshiro256p sanity])
-
-TEST_NEED_PROGRAM([rng-test])
-AT_CHECK([rng-test >out
-grep -v '^ok' out], [0], [1..200
-])
-
-AT_CLEANUP
+TEST_TAP_SIMPLE([xoshiro256p sanity], [rng-test],
+  [TEST_NEED_PROGRAM([rng-test])])
 
 dnl Verify that randomdecl actually produces all keywords and a variety
 dnl of different declarations.
@@ -36,8 +30,8 @@ m4_define([sanity_tests], [dnl
   [[^type], [type name]],
   [[inline], [inline function specifier]],
   [[inline inline], [redundant function specifiers]],
-  [[function (@<:@RE_ALNUM()_@:>@* as], [named function parameter]],
-  [[function (void)], [empty prototype declaration]],
+  [[function [(]@<:@]]RE_ALNUM()_[[@:>@* as], [named function parameter]],
+  [[function [(]void[)]], [empty prototype declaration]],
   [[function returning], [non-prototype function declaration]],
   [[\.\.\.], [variadic function]],
   [[const], [const qualifier]],
@@ -68,15 +62,24 @@ m4_define([sanity_tests], [dnl
   [[pointer to function], [pointer to a function]],
 ])
 
-m4_define([sanity_sed], [/$1/i\
-FOUND $2])AT_DATA([sanity.sed], [#n
-m4_map_sep([sanity_sed], [m4_newline], [sanity_tests])
+m4_define([sanity_awk], [[/$1/ { found["$2"] = 1; }
+]])AT_DATA([sanity.awk],
+[# We don't need any field splitting, so choose a character that does not
+# appear in C code to avoid tripping over 199-field limit in HP-UX 11 awk.
+BEGIN { FS = "@"; }
+m4_map([sanity_awk], [sanity_tests])dnl
+END { for (k in found) print "FOUND", k; }
 ])
-sed -n '/^FOUND/p' sanity.sed | LC_ALL=C sort -u >expout
+
+m4_define([sanity_exp], [[FOUND $2
+]])
+LC_ALL=C sort >expout <<'EOF'
+m4_map([sanity_exp], [sanity_tests])dnl
+EOF
 
 printf 'Using seed %d\n' "$random_seed" >&AS_MESSAGE_LOG_FD
 AT_CHECK([randomdecl -En 10000 -s "$random_seed" >decls], [0])
-AT_CHECK([sed -f sanity.sed decls | LC_ALL=C sort -u], [0], [expout])
+AT_CHECK([$AWK -f sanity.awk decls | LC_ALL=C sort], [0], [expout])
 
 AT_CLEANUP