tests: Use TAP helpers in rng-test.

[cdecl99.git] / tests / stress.at

diff --git a/tests/stress.at b/tests/stress.at
index 9b45cea46f7da3981a30b64eee80f28b64e5c4d4..b71836950db3d98de82f85b0140e2f489bf4cd20 100644 (file)
--- 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,7 +30,7 @@ m4_define([sanity_tests], [dnl
   [[^type], [type name]],
   [[inline], [inline function specifier]],
   [[inline inline], [redundant function specifiers]],
-  [[function (@<:@@<:@:alnum:@:>@_@:>@* as], [named function parameter]],
+  [[function (@<:@RE_ALNUM()_@:>@* as], [named function parameter]],
   [[function (void)], [empty prototype declaration]],
   [[function returning], [non-prototype function declaration]],
   [[\.\.\.], [variadic function]],
@@ -59,23 +63,23 @@ m4_define([sanity_tests], [dnl
 ])
 
 m4_define([sanity_sed], [/$1/i\
-AS_TR_SH([$2])=:])
-AT_DATA([sanity.sed], [#n
+FOUND $2])AT_DATA([sanity.sed], [#n
 m4_map_sep([sanity_sed], [m4_newline], [sanity_tests])
 ])
+sed -n '/^FOUND/p' sanity.sed | LC_ALL=C sort -u >expout
 
 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
+AT_CHECK([randomdecl -En 10000 -s "$random_seed" >decls], [0])
+AT_CHECK([sed -f sanity.sed decls | LC_ALL=C sort -u], [0], [expout])
 
-exec 3<decls.chk
-while read var <&3; do
-  eval "$var"
-done
-exec 3<&-
+AT_CLEANUP
 
-m4_define([sanity_check], [AT_CHECK([$AS_TR_SH([$2]) false])])
-m4_map([sanity_check], [sanity_tests])
+AT_SETUP([random cross-parse])
 
+TEST_NEED_PROGRAM([randomdecl])
+TEST_NEED_PROGRAM([crossparse])
+
+printf 'Using seed %d\n' "$random_seed" >&AS_MESSAGE_LOG_FD
+AT_CHECK([randomdecl -n "$random_iter" -s "$random_seed"],, [stdout-nolog])
+AT_CHECK([crossparse -f stdout])
 AT_CLEANUP