luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests/desktop-app-info: Use named pipe instead of /proc

Browse Source 
Freebsd doesn't always have /proc mounted, so relying on
/proc for the tests isn't ideal.

This commit changes the desktop-app-info tests to use
mkfifo instead of /proc/../fd/.. to relay terminal
arguments.

Might help with this error message I'm seeing in CI:

/tmp/bin-path-H1UQT1/gnome-terminal: cannot create /proc/38961/fd/6: No such file or directory
This commit is contained in:
Ray Strode 2022-10-17 14:44:14 -04:00
parent 066ca6b042
commit 4657e9bf60
1 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gio/tests/desktop-app-info.c
View File

@ -30,6 +30,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
static GAppInfo *
create_command_line_app_info (const char *name,
@ -1218,7 +1220,9 @@ test_launch_uris_with_terminal (gconstpointer data)
/* FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/2781 */
g_test_skip ("/proc pipe sharing currently doesn’t work reliably on FreeBSD CI");
#else
int fds[2];
int fd;
int ret;
int flags;
const char *terminal_exec = data;
char *old_path;
char *command_line;
@ -1226,7 +1230,7 @@ test_launch_uris_with_terminal (gconstpointer data)
char *terminal_path;
char *output_fd_path;
char *script_contents;
char *output_contents;
char *output_contents = NULL;
char *sh;
GAppInfo *app_info;
GList *uris;
@ -1245,17 +1249,26 @@ test_launch_uris_with_terminal (gconstpointer data)
old_path = g_strdup (g_getenv ("PATH"));
g_assert_true (g_setenv ("PATH", bin_path, TRUE));
g_unix_open_pipe (fds, FD_CLOEXEC, &error);
g_assert_no_error (error);
terminal_path = g_build_filename (bin_path, terminal_exec, NULL);
output_fd_path = g_strdup_printf (G_DIR_SEPARATOR_S "proc"
G_DIR_SEPARATOR_S "%" G_PID_FORMAT
G_DIR_SEPARATOR_S "fd"
G_DIR_SEPARATOR_S "%d",
getpid (), fds[0]);
output_fd_path = g_build_filename (bin_path, "fifo", NULL);
input_stream = g_unix_input_stream_new (fds[0], TRUE);
ret = mkfifo (output_fd_path, 0600);
g_assert_cmpint (ret, ==, 0);
fd = g_open (output_fd_path, O_RDONLY | O_CLOEXEC | O_NONBLOCK, 0);
g_assert_cmpint (fd, >=, 0);
flags = fcntl (fd, F_GETFL);
g_assert_cmpint (flags, >=, 0);
ret = fcntl (fd, F_SETFL, flags & ~O_NONBLOCK);
g_assert_cmpint (ret, ==, 0);
input_stream = g_unix_input_stream_new (fd, TRUE);
data_input_stream = g_data_input_stream_new (input_stream);
script_contents = g_strdup_printf ("#!%s\n" \
"out='%s'\n"
@ -1288,11 +1301,20 @@ test_launch_uris_with_terminal (gconstpointer data)
g_app_info_launch_uris (app_info, uris, NULL, &error);
g_assert_no_error (error);
output_contents =
g_data_input_stream_read_line (data_input_stream, NULL, NULL, &error);
g_assert_no_error (error);
while (output_contents == NULL)
{
output_contents =
g_data_input_stream_read_upto (data_input_stream, "\n", 1, NULL, NULL, &error);
g_assert_no_error (error);
if (output_contents == NULL)
g_usleep (G_USEC_PER_SEC / 10);
}
g_test_message ("'%s' called with arguments: '%s'", terminal_exec, output_contents);
g_data_input_stream_read_byte (data_input_stream, NULL, &error);
g_assert_no_error (error);
output_args = g_strsplit (output_contents, " ", -1);
g_clear_pointer (&output_contents, g_free);
@ -1305,11 +1327,20 @@ test_launch_uris_with_terminal (gconstpointer data)
g_assert_cmpint (g_list_length (paths), ==, 1);
g_clear_pointer (&output_args, g_strfreev);
output_contents =
g_data_input_stream_read_line (data_input_stream, NULL, NULL, &error);
g_assert_no_error (error);
while (output_contents == NULL)
{
output_contents =
g_data_input_stream_read_upto (data_input_stream, "\n", 1, NULL, NULL, &error);
g_assert_no_error (error);
if (output_contents == NULL)
g_usleep (G_USEC_PER_SEC / 10);
}
g_test_message ("'%s' called with arguments: '%s'", terminal_exec, output_contents);
g_data_input_stream_read_byte (data_input_stream, NULL, &error);
g_assert_no_error (error);
output_args = g_strsplit (output_contents, " ", -1);
g_clear_pointer (&output_contents, g_free);
g_assert_cmpuint (g_strv_length (output_args), ==, 4);
@ -1324,7 +1355,7 @@ test_launch_uris_with_terminal (gconstpointer data)
g_assert_null (paths);
g_assert_true (g_setenv ("PATH", old_path, TRUE));
g_close (fds[1], &error);
g_close (fd, &error);
g_assert_no_error (error);
g_free (sh);