Rename SDL2 tests for SDL3

test/CMakeLists.txt

@@ -123,7 +123,7 @@ add_sdl_test_executable(testatomic NONINTERACTIVE testatomic.c)
 add_sdl_test_executable(testintersections testintersections.c)
 add_sdl_test_executable(testrelative testrelative.c)
 add_sdl_test_executable(testhittesting testhittesting.c)
-add_sdl_test_executable(testdraw2 testdraw2.c)
+add_sdl_test_executable(testdraw testdraw.c)
 add_sdl_test_executable(testdrawchessboard testdrawchessboard.c)
 add_sdl_test_executable(testdropfile testdropfile.c)
 add_sdl_test_executable(testerror NONINTERACTIVE testerror.c)
@@ -137,7 +137,7 @@ endif()
 add_sdl_test_executable(testfile testfile.c)
 add_sdl_test_executable(testgamepad NEEDS_RESOURCES TESTUTILS testgamepad.c)
 add_sdl_test_executable(testgeometry TESTUTILS testgeometry.c)
-add_sdl_test_executable(testgl2 testgl2.c)
+add_sdl_test_executable(testgl testgl.c)
 add_sdl_test_executable(testgles testgles.c)
 add_sdl_test_executable(testgles2 testgles2.c)
 add_sdl_test_executable(testgles2_sdf TESTUTILS testgles2_sdf.c)
@@ -174,7 +174,7 @@ elseif(HAVE_X11)
     target_link_libraries(testnative PRIVATE X11)
 endif()
 
-add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES TESTUTILS testoverlay2.c)
+add_sdl_test_executable(testoverlay NEEDS_RESOURCES TESTUTILS testoverlay.c)
 add_sdl_test_executable(testplatform NONINTERACTIVE testplatform.c)
 add_sdl_test_executable(testpower NONINTERACTIVE testpower.c)
 add_sdl_test_executable(testfilesystem NONINTERACTIVE testfilesystem.c)
@@ -184,14 +184,14 @@ add_sdl_test_executable(testsem testsem.c)
 add_sdl_test_executable(testsensor testsensor.c)
 add_sdl_test_executable(testshader NEEDS_RESOURCES testshader.c)
 add_sdl_test_executable(testshape NEEDS_RESOURCES testshape.c)
-add_sdl_test_executable(testsprite2 NEEDS_RESOURCES TESTUTILS testsprite2.c)
+add_sdl_test_executable(testsprite NEEDS_RESOURCES TESTUTILS testsprite.c)
 add_sdl_test_executable(testspriteminimal NEEDS_RESOURCES TESTUTILS testspriteminimal.c)
 add_sdl_test_executable(teststreaming NEEDS_RESOURCES TESTUTILS teststreaming.c)
 add_sdl_test_executable(testtimer NONINTERACTIVE testtimer.c)
 add_sdl_test_executable(testurl testurl.c)
 add_sdl_test_executable(testver NONINTERACTIVE testver.c)
 add_sdl_test_executable(testviewport NEEDS_RESOURCES TESTUTILS testviewport.c)
-add_sdl_test_executable(testwm2 testwm2.c)
+add_sdl_test_executable(testwm testwm.c)
 add_sdl_test_executable(testyuv NEEDS_RESOURCES testyuv.c testyuv_cvt.c)
 add_sdl_test_executable(torturethread torturethread.c)
 add_sdl_test_executable(testrendercopyex NEEDS_RESOURCES TESTUTILS testrendercopyex.c)
@@ -241,14 +241,14 @@ endif()
 if(OPENGL_FOUND)
     if(TARGET OpenGL::GL)
         target_link_libraries(testshader PRIVATE OpenGL::GL)
-        target_link_libraries(testgl2 PRIVATE OpenGL::GL)
+        target_link_libraries(testgl PRIVATE OpenGL::GL)
     else()
         if(EMSCRIPTEN AND OPENGL_gl_LIBRARY STREQUAL "nul")
             set(OPENGL_gl_LIBRARY GL)
         endif()
         # emscripten's FindOpenGL.cmake does not create OpenGL::GL
         target_link_libraries(testshader PRIVATE ${OPENGL_gl_LIBRARY})
-        target_link_libraries(testgl2 PRIVATE ${OPENGL_gl_LIBRARY})
+        target_link_libraries(testgl PRIVATE ${OPENGL_gl_LIBRARY})
     endif()
 endif()
 if(EMSCRIPTEN)

test/README

@@ -8,7 +8,7 @@ These are test programs for the SDL library:
 	testaudioinfo	Lists audio device capabilities
 	testerror	Tests multi-threaded error handling
 	testfile	Tests RWops layer
-	testgl2		A very simple example of using OpenGL with SDL
+	testgl		A very simple example of using OpenGL with SDL
 	testiconv	Tests international string conversion
 	testjoystick	List joysticks and watch joystick events
 	testkeys	List the available keyboard keys
@@ -17,15 +17,15 @@ These are test programs for the SDL library:
 	testlock	Hacked up test of multi-threading and locking
 	testmouse	Tests mouse coordinates
 	testmultiaudio	Tests using several audio devices
-	testoverlay2	Tests the overlay flickering/scaling during playback.
+	testoverlay	Tests the overlay flickering/scaling during playback.
 	testplatform	Tests types, endianness and cpu capabilities
 	testsem		Tests SDL's semaphore implementation
 	testshape	Tests shaped windows
-	testsprite2	Example of fast sprite movement on the screen
+	testsprite	Example of fast sprite movement on the screen
 	testthread	Hacked up test of multi-threading
 	testtimer	Test the timer facilities
 	testver		Check the version and dynamic loading and endianness
-	testwm2		Test window manager -- title, icon, events
+	testwm		Test window manager -- title, icon, events
 	torturethread	Simple test for thread creation/destruction
 	gamepadmap   Useful to generate Game Controller API compatible maps