From 061d69614aeedce55856c52e3db45cb589396fb8 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 4 Jul 2014 15:13:41 +0400 Subject: [PATCH] zdtm: Pick up deleted unix socket test (v2) CRIU doesn't support relative unix sockets paths, so tune the test to use absolute. (v2: Off-by-one spotted by Filipe) Signed-off-by: Pavel Emelyanov --- test/zdtm.sh | 1 + test/zdtm/live/static/deleted_unix_sock.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/zdtm.sh b/test/zdtm.sh index 2212176b6..479427a24 100755 --- a/test/zdtm.sh +++ b/test/zdtm.sh @@ -59,6 +59,7 @@ static/sock_opts01 static/sockets_spair static/sockets_dgram static/socket_queues +static/deleted_unix_sock static/sk-unix-unconn static/pid00 static/pstree diff --git a/test/zdtm/live/static/deleted_unix_sock.c b/test/zdtm/live/static/deleted_unix_sock.c index 79636ef29..7757280b3 100644 --- a/test/zdtm/live/static/deleted_unix_sock.c +++ b/test/zdtm/live/static/deleted_unix_sock.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include #include #include @@ -19,11 +20,14 @@ TEST_OPTION(filename, string, "file name", 1); static int fill_sock_name(struct sockaddr_un *name, const char *filename) { - if (strlen(filename) >= sizeof(name->sun_path)) + char *cwd; + + cwd = get_current_dir_name(); + if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) return -1; name->sun_family = AF_LOCAL; - strcpy(name->sun_path, filename); + sprintf(name->sun_path, "%s/%s", cwd, filename); return 0; }