Browse Source

tests: start memory tracking first + clean up cached text textures

Anonymous Maarten 8 months ago
parent
commit
3bfc103e76
6 changed files with 17 additions and 12 deletions
  1. 4 3
      test/testcustomcursor.c
  2. 6 5
      test/testdraw.c
  3. 1 0
      test/testpopup.c
  4. 4 3
      test/testrendertarget.c
  5. 1 0
      test/testtime.c
  6. 1 1
      test/testtimer.c

+ 4 - 3
test/testcustomcursor.c

@@ -342,14 +342,15 @@ int main(int argc, char *argv[])
     const char *color_cursor = NULL;
     SDL_Cursor *cursor;
 
-    /* Enable standard application logging */
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
-
     /* Initialize test framework */
     state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
     if (!state) {
         return 1;
     }
+
+    /* Enable standard application logging */
+    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
     for (i = 1; i < argc;) {
         int consumed;
 

+ 6 - 5
test/testdraw.c

@@ -14,7 +14,7 @@
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
-#include <SDL3/SDL_test_common.h>
+#include <SDL3/SDL_test.h>
 
 #ifdef SDL_PLATFORM_EMSCRIPTEN
 #include <emscripten/emscripten.h>
@@ -217,10 +217,6 @@ static void loop(void)
 int main(int argc, char *argv[])
 {
     int i;
-
-    /* Enable standard application logging */
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
-
     /* Initialize parameters */
     num_objects = NUM_OBJECTS;
 
@@ -229,6 +225,10 @@ int main(int argc, char *argv[])
     if (!state) {
         return 1;
     }
+
+    /* Enable standard application logging */
+    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
     for (i = 1; i < argc;) {
         int consumed;
 
@@ -309,6 +309,7 @@ int main(int argc, char *argv[])
     }
 #endif
 
+    SDLTest_CleanupTextDrawing();
     SDLTest_CommonQuit(state);
 
     return 0;

+ 1 - 0
test/testpopup.c

@@ -55,6 +55,7 @@ static void quit(int rc)
     SDL_free(menus);
     menus = NULL;
 
+    SDLTest_CleanupTextDrawing();
     SDLTest_CommonQuit(state);
     /* Let 'main()' return normally */
     if (rc != 0) {

+ 4 - 3
test/testrendertarget.c

@@ -218,14 +218,15 @@ int main(int argc, char *argv[])
     int frames;
     Uint64 then, now;
 
-    /* Enable standard application logging */
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
-
     /* Initialize test framework */
     state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
     if (!state) {
         return 1;
     }
+
+    /* Enable standard application logging */
+    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
     for (i = 1; i < argc;) {
         int consumed;
 

+ 1 - 0
test/testtime.c

@@ -221,6 +221,7 @@ int main(int argc, char *argv[])
     }
 
 quit:
+    SDLTest_CleanupTextDrawing();
     SDLTest_CommonQuit(state);
     return 0;
 }

+ 1 - 1
test/testtimer.c

@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
         return_code = test_sdl_delay_within_bounds();
     }
 
-    SDLTest_CommonDestroyState(state);
     SDL_Quit();
+    SDLTest_CommonDestroyState(state);
     return return_code;
 }