diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-05-02 09:38:25 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-05-02 09:38:25 +0000 |
| commit | 1f044e1cbdd36428acb7dbb0bbb2f4f1ff1a6b45 (patch) | |
| tree | 06047021df8cdfa8616d472ccd6c55dc4637147f | |
| parent | c86fde7e02bb942af2165fb7e7a1947469ed45bc (diff) | |
| parent | dea11643a9024874a355b7d7dcd26fd6bff01d6f (diff) | |
| download | glib-1f044e1cbdd36428acb7dbb0bbb2f4f1ff1a6b45.tar.gz | |
Merge branch '2855-test-socket-rename' into 'main'
Rename confusing socket test filenames
Closes #2855
See merge request GNOME/glib!3415
| -rw-r--r-- | gio/tests/meson.build | 4 | ||||
| -rw-r--r-- | gio/tests/socket-common.c | 2 | ||||
| -rw-r--r-- | gio/tests/socket-testclient.c (renamed from gio/tests/socket-client.c) | 0 | ||||
| -rw-r--r-- | gio/tests/socket-testserver.c (renamed from gio/tests/socket-server.c) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 8da884001..2ff34a5d0 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -590,8 +590,8 @@ test_extra_programs += { 'proxy' : {'install' : false}, 'resolver' : {'install' : false}, 'send-data' : {'install' : false}, - 'socket-server' : {'install' : false}, - 'socket-client' : { + 'socket-testserver' : {'install' : false}, + 'socket-testclient' : { 'extra_sources' : ['gtlsconsoleinteraction.c'], 'install' : false, }, diff --git a/gio/tests/socket-common.c b/gio/tests/socket-common.c index 18d083a30..b740f68e7 100644 --- a/gio/tests/socket-common.c +++ b/gio/tests/socket-common.c @@ -1,4 +1,4 @@ -/* #included into both socket-client.c and socket-server.c */ +/* #included into both socket-testclient.c and socket-testserver.c */ #ifdef G_OS_UNIX static const char *unix_socket_address_types[] = { diff --git a/gio/tests/socket-client.c b/gio/tests/socket-testclient.c index 025632767..025632767 100644 --- a/gio/tests/socket-client.c +++ b/gio/tests/socket-testclient.c diff --git a/gio/tests/socket-server.c b/gio/tests/socket-testserver.c index 61715b02d..61715b02d 100644 --- a/gio/tests/socket-server.c +++ b/gio/tests/socket-testserver.c |