Commit 3ac201cf7fcb231ee0042e50555b7cad37fd0f07
2016-10-01T12:33:26
Fixed bug 3319 - Getting the POSIX out of testqsort.c Simon Hug There's a call to the POSIX function random in test/testqsort.c. Naturally, Windows doesn't do that. The attached patch changes the call to the SDLtest framework random functions and adds some seed control. Looking at SDLTest_RandomInitTime, I just want to say that 'srand((unsigned int)time(NULL)); a=rand(); srand(clock()); b=rand();' is an absolutely terrible way to initialize a seed on Windows because of its terrible LCG.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/test/testqsort.c b/test/testqsort.c
index 2a7c66b..48659f3 100644
--- a/test/testqsort.c
+++ b/test/testqsort.c
@@ -10,10 +10,7 @@
freely.
*/
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "SDL.h"
+#include "SDL_test.h"
static int
num_compare(const void *_a, const void *_b)
@@ -50,6 +47,33 @@ main(int argc, char *argv[])
static int nums[1024 * 100];
static const int itervals[] = { SDL_arraysize(nums), 12 };
int iteration;
+ SDLTest_RandomContext rndctx;
+
+ if (argc > 1)
+ {
+ int success;
+ Uint64 seed = 0;
+ if (argv[1][0] == '0' && argv[1][1] == 'x')
+ success = SDL_sscanf(argv[1] + 2, "%llx", &seed);
+ else
+ success = SDL_sscanf(argv[1], "%llu", &seed);
+ if (!success)
+ {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Invalid seed. Use a decimal or hexadecimal number.\n");
+ return 1;
+ }
+ if (seed <= 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));
+ }
+ else
+ {
+ SDLTest_RandomInitTime(&rndctx);
+ }
+ SDL_Log("Using random seed 0x%08x%08x\n", rndctx.x, rndctx.c);
for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) {
const int arraylen = itervals[iteration];
@@ -72,7 +96,7 @@ main(int argc, char *argv[])
test_sort("reverse sorted", nums, arraylen);
for (i = 0; i < arraylen; i++) {
- nums[i] = random();
+ nums[i] = SDLTest_RandomInt(&rndctx);
}
test_sort("random sorted", nums, arraylen);
}