Merge branch 'clang64-strfuncs-test' into 'main'

tests: Use integer widths rather than maximum values for strfuncs check

See merge request GNOME/glib!4843
This commit is contained in:
Philip Withnall
2025-10-01 10:30:08 +00:00
2 changed files with 7 additions and 7 deletions

View File

@@ -293,7 +293,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
MSG msg; MSG msg;
gboolean found_app; gboolean found_app;
@@ -348,7 +348,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
reset_fds (fds, NUM_POLLEES); reset_fds (fds, NUM_POLLEES);
@@ -394,7 +394,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
gint j; gint j;
@@ -443,7 +443,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
gint j; gint j;
MSG msg; MSG msg;
@@ -501,7 +501,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
gint j; gint j;
@@ -551,7 +551,7 @@ test_gpoll (void)
for (i = 0; i < REPEAT; i++) for (i = 0; i < REPEAT; i++)
{ {
gint r, s, v, t; gint r, s, v, t = 0;
gint64 diff; gint64 diff;
gint j; gint j;
MSG msg; MSG msg;

View File

@@ -664,7 +664,7 @@ test_strconcat (void)
static void static void
test_strjoinv_overflow (void) test_strjoinv_overflow (void)
{ {
#if G_MAXSIZE > G_MAXUINT #if GLIB_SIZEOF_SIZE_T > (UINT_WIDTH / 8)
g_test_skip ("Overflow joining strings requires G_MAXSIZE <= G_MAXUINT."); g_test_skip ("Overflow joining strings requires G_MAXSIZE <= G_MAXUINT.");
#else #else
if (!g_test_undefined ()) if (!g_test_undefined ())