From c5a2e928493f9fb08a85d3a0d91055ce4e84db17 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 17 Jan 2026 07:37:00 +0300
Subject: [PATCH] tests: sync with latest SDL2
---
test/testautomation_surface.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/test/testautomation_surface.c b/test/testautomation_surface.c
index f31b4573..c7a3d763 100644
--- a/test/testautomation_surface.c
+++ b/test/testautomation_surface.c
@@ -768,32 +768,24 @@ int surface_testOverflow(void *arg)
if (sizeof(size_t) == 4 && sizeof(int) >= 4) {
SDL_ClearError();
- expectedError = "aligning pitch would overflow"; /* SDL3 error message. Was "Out of memory" */
/* 0x5555'5555 * 3bpp = 0xffff'ffff which fits in size_t, but adding
* alignment padding makes it overflow */
surface = SDL_CreateRGBSurfaceWithFormat(0, 0x55555555, 1, 24, SDL_PIXELFORMAT_RGB24);
SDLTest_AssertCheck(surface == NULL, "Should detect overflow in width + alignment");
- SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), expectedError) == 0,
- "Expected \"%s\", got \"%s\"", expectedError, SDL_GetError());
+ SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), "") != 0, "Error indicator should be set");
SDL_ClearError();
- expectedError = "width * bpp would overflow"; /* SDL3 error message. */
/* 0x4000'0000 * 4bpp = 0x1'0000'0000 which (just) overflows */
surface = SDL_CreateRGBSurfaceWithFormat(0, 0x40000000, 1, 32, SDL_PIXELFORMAT_ARGB8888);
SDLTest_AssertCheck(surface == NULL, "Should detect overflow in width * bytes per pixel");
- SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), expectedError) == 0,
- "Expected \"%s\", got \"%s\"", expectedError, SDL_GetError());
+ SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), "") != 0, "Error indicator should be set");
SDL_ClearError();
- expectedError = "height * pitch would overflow"; /* SDL3 error message. */
surface = SDL_CreateRGBSurfaceWithFormat(0, (1 << 29) - 1, (1 << 29) - 1, 8, SDL_PIXELFORMAT_INDEX8);
SDLTest_AssertCheck(surface == NULL, "Should detect overflow in width * height");
- SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), expectedError) == 0,
- "Expected \"%s\", got \"%s\"", expectedError, SDL_GetError());
+ SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), "") != 0, "Error indicator should be set");
SDL_ClearError();
- expectedError = "height * pitch would overflow"; /* SDL3 error message. */
surface = SDL_CreateRGBSurfaceWithFormat(0, (1 << 15) + 1, (1 << 15) + 1, 32, SDL_PIXELFORMAT_ARGB8888);
SDLTest_AssertCheck(surface == NULL, "Should detect overflow in width * height * bytes per pixel");
- SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), expectedError) == 0,
- "Expected \"%s\", got \"%s\"", expectedError, SDL_GetError());
+ SDLTest_AssertCheck(SDL_strcmp(SDL_GetError(), "") != 0, "Error indicator should be set");
} else {
SDLTest_Log("Can't easily overflow size_t on this platform");
}