luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib/tests: fix compilation with MSVC

Browse Source 
glib/tests/spawn-singlethread.c(439): error C2057: expected constant expression

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-01-27 00:06:10 +04:00
parent 50d23f9680
commit 8309872111
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/tests/spawn-singlethread.c
View File

@ -436,9 +436,9 @@ test_spawn_fd_assignment_clash (void)
#if defined(G_OS_UNIX) && defined(F_DUPFD_CLOEXEC) #if defined(G_OS_UNIX) && defined(F_DUPFD_CLOEXEC)
int tmp_fd; int tmp_fd;
guint i; guint i;
const guint n_fds = 10; #define N_FDS 10
gint source_fds[n_fds]; gint source_fds[N_FDS];
gint target_fds[n_fds]; gint target_fds[N_FDS];
const gchar *argv[] = { "/nonexistent", NULL }; const gchar *argv[] = { "/nonexistent", NULL };
gboolean retval; gboolean retval;
GError *local_error = NULL; GError *local_error = NULL;
@ -449,27 +449,27 @@ test_spawn_fd_assignment_clash (void)
tmp_fd = g_file_open_tmp ("glib-spawn-test-XXXXXX", NULL, NULL); tmp_fd = g_file_open_tmp ("glib-spawn-test-XXXXXX", NULL, NULL);
g_assert_cmpint (tmp_fd, >=, 0); g_assert_cmpint (tmp_fd, >=, 0);
for (i = 0; i < (n_fds - 1); ++i) for (i = 0; i < (N_FDS - 1); ++i)
{ {
int source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3); int source = fcntl (tmp_fd, F_DUPFD_CLOEXEC, 3);
g_assert_cmpint (source, >=, 0); g_assert_cmpint (source, >=, 0);
source_fds[i] = source; source_fds[i] = source;
target_fds[i] = source + n_fds; target_fds[i] = source + N_FDS;
} }
source_fds[i] = tmp_fd; source_fds[i] = tmp_fd;
target_fds[i] = tmp_fd + n_fds; target_fds[i] = tmp_fd + N_FDS;
/* Print out the FD map. */ /* Print out the FD map. */
g_test_message ("FD map:"); g_test_message ("FD map:");
for (i = 0; i < n_fds; i++) for (i = 0; i < N_FDS; i++)
g_test_message (" • %d → %d", source_fds[i], target_fds[i]); g_test_message (" • %d → %d", source_fds[i], target_fds[i]);
/* Spawn the subprocess. This should fail because the executable doesn’t /* Spawn the subprocess. This should fail because the executable doesn’t
* exist. */ * exist. */
retval = g_spawn_async_with_pipes_and_fds (NULL, argv, NULL, G_SPAWN_DEFAULT, retval = g_spawn_async_with_pipes_and_fds (NULL, argv, NULL, G_SPAWN_DEFAULT,
NULL, NULL, -1, -1, -1, NULL, NULL, -1, -1, -1,
source_fds, target_fds, n_fds, source_fds, target_fds, N_FDS,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&local_error); &local_error);
g_assert_error (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT); g_assert_error (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT);
@ -484,7 +484,7 @@ test_spawn_fd_assignment_clash (void)
g_assert_cmpuint (statbuf.st_size, ==, 0); g_assert_cmpuint (statbuf.st_size, ==, 0);
/* Clean up. */ /* Clean up. */
for (i = 0; i < n_fds; i++) for (i = 0; i < N_FDS; i++)
g_close (source_fds[i], NULL); g_close (source_fds[i], NULL);
#else /* !G_OS_UNIX */ #else /* !G_OS_UNIX */
g_test_skip ("FD redirection only supported on Unix with F_DUPFD_CLOEXEC"); g_test_skip ("FD redirection only supported on Unix with F_DUPFD_CLOEXEC");