mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-05-04 13:04:41 +00:00
Replaced test framework random code with SDL random functions
This commit is contained in:
@@ -67,12 +67,10 @@ int main(int argc, char *argv[])
|
||||
static const int itervals[] = { SDL_arraysize(nums), 12 };
|
||||
int i;
|
||||
int iteration;
|
||||
SDLTest_RandomContext rndctx;
|
||||
SDLTest_CommonState *state;
|
||||
Uint64 seed = 0;
|
||||
int seed_seen = 0;
|
||||
|
||||
SDL_zero(rndctx);
|
||||
|
||||
/* Initialize test framework */
|
||||
state = SDLTest_CommonCreateState(argv, 0);
|
||||
if (!state) {
|
||||
@@ -86,7 +84,6 @@ int main(int argc, char *argv[])
|
||||
consumed = SDLTest_CommonArg(state, i);
|
||||
if (!consumed) {
|
||||
if (!seed_seen) {
|
||||
Uint64 seed = 0;
|
||||
char *endptr = NULL;
|
||||
|
||||
seed = SDL_strtoull(argv[i], &endptr, 0);
|
||||
@@ -97,11 +94,6 @@ int main(int argc, char *argv[])
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Invalid seed. Use a decimal or hexadecimal number.\n");
|
||||
return 1;
|
||||
}
|
||||
if (seed <= ((Uint64)0xffffffff)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Seed must be equal or greater than 0x100000000.\n");
|
||||
return 1;
|
||||
}
|
||||
SDLTest_RandomInit(&rndctx, (unsigned int)(seed >> 32), (unsigned int)(seed & 0xffffffff));
|
||||
}
|
||||
}
|
||||
if (consumed <= 0) {
|
||||
@@ -114,9 +106,9 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
if (!seed_seen) {
|
||||
SDLTest_RandomInitTime(&rndctx);
|
||||
seed = SDL_GetPerformanceCounter();
|
||||
}
|
||||
SDL_Log("Using random seed 0x%08x%08x\n", rndctx.x, rndctx.c);
|
||||
SDL_Log("Using random seed 0x%" SDL_PRIx64 "\n", seed);
|
||||
|
||||
for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) {
|
||||
const int arraylen = itervals[iteration];
|
||||
@@ -138,7 +130,7 @@ int main(int argc, char *argv[])
|
||||
test_sort("reverse sorted", nums, arraylen);
|
||||
|
||||
for (i = 0; i < arraylen; i++) {
|
||||
nums[i] = SDLTest_RandomInt(&rndctx);
|
||||
nums[i] = SDL_rand_r(&seed, SDL_MAX_SINT32);
|
||||
}
|
||||
test_sort("random sorted", nums, arraylen);
|
||||
}
|
||||
|
||||
@@ -11,9 +11,6 @@
|
||||
*/
|
||||
/* Simple program: Move N sprites around on the screen as fast as possible */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#define SDL_MAIN_USE_CALLBACKS 1
|
||||
#include <SDL3/SDL_test.h>
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
@@ -558,7 +555,7 @@ int SDL_AppInit(void **appstate, int argc, char *argv[])
|
||||
seed = (Uint64)iterations;
|
||||
} else {
|
||||
/* Pseudo-random seed generated from the time */
|
||||
seed = (Uint64)time(NULL);
|
||||
seed = SDL_GetPerformanceCounter();
|
||||
}
|
||||
SDLTest_FuzzerInit(seed);
|
||||
for (i = 0; i < num_sprites; ++i) {
|
||||
|
||||
Reference in New Issue
Block a user