test: use SDL_test for parsing arguments in all non-interactive tests

test/testqsort.c

@@ -43,36 +43,73 @@ test_sort(const char *desc, int *nums, const int arraylen)
 
 int main(int argc, char *argv[])
 {
+    SDLTest_CommonState *state;
     static int nums[1024 * 100];
     static const int itervals[] = { SDL_arraysize(nums), 12 };
     int iteration;
+    int i;
+    SDL_bool custom_seed = SDL_FALSE;
+    Uint64 seed;
     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, "%" SDL_PRIx64, &seed);
-        } else {
-            success = SDL_sscanf(argv[1], "%" SDL_PRIu64, &seed);
+    state = SDLTest_CommonCreateState(argv, 0);
+    if (!state) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDLTest_CommonCreateState failed: %s\n", SDL_GetError());
+        return 1;
+    }
+
+    /* Enable standard application logging */
+    SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+    /* Parse commandline */
+    for (i = 1; i < argc;) {
+        int consumed;
+
+        consumed = SDLTest_CommonArg(state, i);
+        if (!consumed) {
+            if (!custom_seed) {
+                int success;
+
+                if (argv[i][0] == '0' && argv[i][1] == 'x') {
+                    success = SDL_sscanf(argv[i] + 2, "%" SDL_PRIx64, &seed);
+                } else {
+                    success = SDL_sscanf(argv[i], "%" SDL_PRIu64, &seed);
+                }
+                if (!success) {
+                    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;
+                }
+                custom_seed = SDL_TRUE;
+                consumed = 1;
+            }
         }
-        if (!success) {
-            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;
+
+        if (consumed <= 0) {
+            static const char *options[] = { "[SEED]", NULL };
+            SDLTest_CommonLogUsage(state, argv[0], options);
+            exit(1);
         }
+
+        i += consumed;
+    }
+
+    if (custom_seed) {
         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);
 
+    if (!SDLTest_CommonInit(state)) {
+        return 1;
+    }
+
     for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) {
         const int arraylen = itervals[iteration];
-        int i;
 
         for (i = 0; i < arraylen; i++) {
             nums[i] = i;
@@ -96,6 +133,8 @@ int main(int argc, char *argv[])
         test_sort("random sorted", nums, arraylen);
     }
 
+    SDLTest_CommonQuit(state);
+
     return 0;
 }