diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-07-10 11:27:08 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-07-10 11:27:08 +0200 |
| commit | b2a4feeb4c877ff56d9b2ebd8119225c53ea40db (patch) | |
| tree | db22ae94ddf1208824e9ec70176dce63cb073174 /test | |
| parent | eac9250fd5b10809830361b94438339b3b31b270 (diff) | |
| parent | 422a9334294dd9a5b13abd8563a3dc7233e64b13 (diff) | |
Merge branch 'master' into mq-filter-stack
Diffstat (limited to 'test')
| -rw-r--r-- | test/birdtest.c | 16 | ||||
| -rw-r--r-- | test/birdtest.h | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/test/birdtest.c b/test/birdtest.c index 2d1e73de..c0d4bd05 100644 --- a/test/birdtest.c +++ b/test/birdtest.c @@ -44,23 +44,17 @@ int bt_result; /* Overall program run result */ int bt_suite_result; /* One suit result */ char bt_out_fmt_buf[1024]; /* Temporary memory buffer for output of testing function */ -long int -bt_random(void) -{ - /* Seeded in bt_init() */ - long int rand_low, rand_high; - - rand_low = random(); - rand_high = random(); - return (rand_low & 0xffff) | ((rand_high & 0xffff) << 16); -} +u64 bt_random_state[] = { + 0x80241f302bd4d95d, 0xd10ba2e910f772b, 0xea188c9046f507c5, 0x4c4c581f04e6da05, + 0x53d9772877c1b647, 0xab8ce3eb466de6c5, 0xad02844c8a8e865f, 0xe8cc78080295065d +}; void bt_init(int argc, char *argv[]) { int c; - srandom(BT_RANDOM_SEED); + initstate(BT_RANDOM_SEED, (char *) bt_random_state, sizeof(bt_random_state)); bt_verbose = 0; bt_filename = argv[0]; diff --git a/test/birdtest.h b/test/birdtest.h index 18228711..dacfb095 100644 --- a/test/birdtest.h +++ b/test/birdtest.h @@ -33,7 +33,8 @@ extern const char *bt_test_id; void bt_init(int argc, char *argv[]); int bt_exit_value(void); int bt_test_suite_base(int (*test_fn)(const void *), const char *test_id, const void *test_fn_argument, int forked, int timeout, const char *dsc, ...); -long int bt_random(void); +static inline u64 bt_random(void) +{ return ((u64) random() & 0xffffffff) | ((u64) random() << 32); } void bt_log_suite_result(int result, const char *fmt, ...); void bt_log_suite_case_result(int result, const char *fmt, ...); @@ -41,7 +42,7 @@ void bt_log_suite_case_result(int result, const char *fmt, ...); #define BT_TIMEOUT 5 /* Default timeout in seconds */ #define BT_FORKING 1 /* Forking is enabled in default */ -#define BT_RANDOM_SEED 982451653 +#define BT_RANDOM_SEED 0x5097d2bb #define BT_BUFFER_SIZE 10000 |