From 198b77a35965824ae4115a3488d3ecb72431c5f6 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 1 Jan 2024 23:54:33 -0500 Subject: [PATCH] tests: Fix randomdecl RNG initialization regression. Recent changes broke the RNG initialization so that instead of actually using the user-supplied seed, uninitialized garbage is used instead. --- t/rng.c | 3 ++- tests/stress.at | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/t/rng.c b/t/rng.c index cbab4a7..3842d3d 100644 --- a/t/rng.c +++ b/t/rng.c @@ -1,6 +1,6 @@ /* * Simple random number generator for testing. - * Copyright © 2022-2023 Nick Bowler + * Copyright © 2022-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 @@ -83,6 +83,7 @@ struct test_rng *test_rng_alloc(const char *seed_str) fprintf(stderr, "%s: invalid seed\n", seed_str); return NULL; } + seed = seed_val; rng = malloc_nofail(sizeof *rng); rng->state[0] = splitmix64(&seed); diff --git a/tests/stress.at b/tests/stress.at index 1426062..fbdb368 100644 --- a/tests/stress.at +++ b/tests/stress.at @@ -1,4 +1,4 @@ -# Copyright © 2012, 2020, 2022-2023 Nick Bowler +# Copyright © 2012, 2020, 2022-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 @@ -77,7 +77,7 @@ 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 +AS_ECHO(["Using seed $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]) @@ -88,7 +88,7 @@ AT_SETUP([random cross-parse]) TEST_NEED_PROGRAM([randomdecl]) TEST_NEED_PROGRAM([crossparse]) -printf 'Using seed %d\n' "$random_seed" >&AS_MESSAGE_LOG_FD +AS_ECHO(["Using seed $random_seed"]) >&AS_MESSAGE_LOG_FD AT_CHECK([randomdecl -n "$random_iter" -s "$random_seed"],, [stdout-nolog]) AT_CHECK([crossparse -f stdout]) AT_CLEANUP -- 2.43.2