Commit 097d0618 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

zdtm: don't hardcode file names in test soruces

Cc: Kirill Tkhai <ktkhai@odin.com>
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarAndrew Vagin <avagin@virtuozzo.com>
Acked-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 5ac87708
...@@ -36,7 +36,6 @@ TST_NOFILE = \ ...@@ -36,7 +36,6 @@ TST_NOFILE = \
socket_udplite \ socket_udplite \
socket_aio \ socket_aio \
socket_close_data \ socket_close_data \
socket_close_data01 \
socket_snd_addr \ socket_snd_addr \
socket_dgram_data \ socket_dgram_data \
packet_sock \ packet_sock \
...@@ -191,6 +190,7 @@ TST_FILE = \ ...@@ -191,6 +190,7 @@ TST_FILE = \
file_locks05 \ file_locks05 \
netns-nf \ netns-nf \
maps_file_prot \ maps_file_prot \
socket_close_data01 \
TST_DIR = \ TST_DIR = \
cwd00 \ cwd00 \
......
...@@ -13,7 +13,8 @@ const char *test_doc = "Check data of bound socket and possibility to connect"; ...@@ -13,7 +13,8 @@ const char *test_doc = "Check data of bound socket and possibility to connect";
const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo"; const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo";
#define MSG "hello" #define MSG "hello"
#define NAME "socket_close_data01.sock" char *filename;
TEST_OPTION(filename, string, "file name", 1);
static int client(const char *iter) static int client(const char *iter)
{ {
...@@ -27,7 +28,7 @@ static int client(const char *iter) ...@@ -27,7 +28,7 @@ static int client(const char *iter)
} }
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, NAME); strcpy(addr.sun_path, filename);
if (connect(sk, (void *)&addr, sizeof(struct sockaddr_un)) < 0) { if (connect(sk, (void *)&addr, sizeof(struct sockaddr_un)) < 0) {
pr_perror("connect failed %s\n", iter); pr_perror("connect failed %s\n", iter);
...@@ -57,7 +58,7 @@ int main(int argc, char **argv) ...@@ -57,7 +58,7 @@ int main(int argc, char **argv)
} }
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, NAME); strcpy(addr.sun_path, filename);
if (bind(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) { if (bind(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) {
pr_perror("bind srv"); pr_perror("bind srv");
...@@ -106,6 +107,6 @@ int main(int argc, char **argv) ...@@ -106,6 +107,6 @@ int main(int argc, char **argv)
ret = 0; ret = 0;
pass(); pass();
unlink: unlink:
unlink(NAME); unlink(filename);
return ret; return ret;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment