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

diff --git a/tests/stress.at b/tests/stress.at
index 77c0d20..1426062 100644
--- a/tests/stress.at
+++ b/tests/stress.at
@@ -1,4 +1,4 @@
-# Copyright © 2012, 2020 Nick Bowler
+# Copyright © 2012, 2020, 2022-2023 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
@@ -15,6 +15,10 @@
 
 AT_BANNER([Randomized tests])
 
+dnl Verify the RNG implementation
+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.
 AT_SETUP([randomdecl sanity])
@@ -26,8 +30,8 @@ m4_define([sanity_tests], [dnl
   [[^type], [type name]],
   [[inline], [inline function specifier]],
   [[inline inline], [redundant function specifiers]],
-  [[function (@<:@@<:@: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]],
@@ -58,25 +62,24 @@ m4_define([sanity_tests], [dnl
   [[pointer to function], [pointer to a function]],
 ])
 
-m4_define([sanity_sed], [/$1/i\
-AS_TR_SH([$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; }
 ])
 
-printf 'Using seed %d\n' "$random_seed" >&AS_MESSAGE_LOG_FD
-AT_CHECK([randomdecl -En 10000 -s "$random_seed" >decls], [0], [ignore-nolog])
-AT_CHECK([sed -f sanity.sed decls], [0], [stdout-nolog])
-sort -u stdout >decls.chk
-
-exec 3<decls.chk
-while read var <&3; do
-  eval "$var"
-done
-exec 3<&-
+m4_define([sanity_exp], [[FOUND $2
+]])
+LC_ALL=C sort >expout <<'EOF'
+m4_map([sanity_exp], [sanity_tests])dnl
+EOF
 
-m4_define([sanity_check], [AT_CHECK([$AS_TR_SH([$2]) false])])
-m4_map([sanity_check], [sanity_tests])
+printf 'Using seed %d\n' "$random_seed" >&AS_MESSAGE_LOG_FD
+AT_CHECK([randomdecl -En 10000 -s "$random_seed" >decls], [0])
+AT_CHECK([$AWK -f sanity.awk decls | LC_ALL=C sort], [0], [expout])
 
 AT_CLEANUP