[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/56] tests/tcg/multiarch: don't hard code paths/por
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 12/56] tests/tcg/multiarch: don't hard code paths/ports for linux-test |
Date: |
Tue, 19 Jun 2018 16:43:51 +0100 |
The fixed path and ports get in the way of running our tests and
builds in parallel. Instead of using TESTPATH we use mkdtemp() and
instead of a fixed port we allow the kernel to assign one and query it
afterwards.
Ideally test directory creation should be common functionally across
all TCG tests but this could complicate an already huge patch series
so we mark it as a TODO for next time.
Signed-off-by: Alex Bennée <address@hidden>
---
v7
- chk_error(strlen(tmpdir)) -> assert(tmpdir)
- mark common tempdir as a TODO
diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c
index 6f2c531474..e80eccc0ce 100644
--- a/tests/tcg/multiarch/linux-test.c
+++ b/tests/tcg/multiarch/linux-test.c
@@ -40,9 +40,8 @@
#include <dirent.h>
#include <setjmp.h>
#include <sys/shm.h>
+#include <assert.h>
-#define TESTPATH "/tmp/linux-test.tmp"
-#define TESTPORT 7654
#define STACK_SIZE 16384
static void error1(const char *filename, int line, const char *fmt, ...)
@@ -85,19 +84,16 @@ static void test_file(void)
struct iovec vecs[2];
DIR *dir;
struct dirent *de;
+ /* TODO: make common tempdir creation for tcg tests */
+ char template[] = "/tmp/linux-test-XXXXXX";
+ char *tmpdir = mkdtemp(template);
- /* clean up, just in case */
- unlink(TESTPATH "/file1");
- unlink(TESTPATH "/file2");
- unlink(TESTPATH "/file3");
- rmdir(TESTPATH);
+ assert(tmpdir);
if (getcwd(cur_dir, sizeof(cur_dir)) == NULL)
error("getcwd");
- chk_error(mkdir(TESTPATH, 0755));
-
- chk_error(chdir(TESTPATH));
+ chk_error(chdir(tmpdir));
/* open/read/write/close/readv/writev/lseek */
@@ -163,7 +159,7 @@ static void test_file(void)
st.st_mtime != 1000)
error("stat time");
- chk_error(stat(TESTPATH, &st));
+ chk_error(stat(tmpdir, &st));
if (!S_ISDIR(st.st_mode))
error("stat mode");
@@ -185,7 +181,7 @@ static void test_file(void)
error("stat mode");
/* getdents */
- dir = opendir(TESTPATH);
+ dir = opendir(tmpdir);
if (!dir)
error("opendir");
len = 0;
@@ -207,7 +203,7 @@ static void test_file(void)
chk_error(unlink("file3"));
chk_error(unlink("file2"));
chk_error(chdir(cur_dir));
- chk_error(rmdir(TESTPATH));
+ chk_error(rmdir(tmpdir));
}
static void test_fork(void)
@@ -264,7 +260,7 @@ static int server_socket(void)
chk_error(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)));
sockaddr.sin_family = AF_INET;
- sockaddr.sin_port = htons(TESTPORT);
+ sockaddr.sin_port = htons(0); /* choose random ephemeral port) */
sockaddr.sin_addr.s_addr = 0;
chk_error(bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)));
chk_error(listen(fd, 0));
@@ -272,7 +268,7 @@ static int server_socket(void)
}
-static int client_socket(void)
+static int client_socket(uint16_t port)
{
int fd;
struct sockaddr_in sockaddr;
@@ -280,7 +276,7 @@ static int client_socket(void)
/* server socket */
fd = chk_error(socket(PF_INET, SOCK_STREAM, 0));
sockaddr.sin_family = AF_INET;
- sockaddr.sin_port = htons(TESTPORT);
+ sockaddr.sin_port = htons(port);
inet_aton("127.0.0.1", &sockaddr.sin_addr);
chk_error(connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)));
return fd;
@@ -292,10 +288,17 @@ static void test_socket(void)
{
int server_fd, client_fd, fd, pid, ret, val;
struct sockaddr_in sockaddr;
- socklen_t len;
+ struct sockaddr_in server_addr;
+ socklen_t len, socklen;
+ uint16_t server_port;
char buf[512];
server_fd = server_socket();
+ /* find out what port we got */
+ socklen = sizeof(server_addr);
+ ret = getsockname(server_fd, &server_addr, &socklen);
+ chk_error(ret);
+ server_port = ntohs(server_addr.sin_port);
/* test a few socket options */
len = sizeof(val);
@@ -305,7 +308,7 @@ static void test_socket(void)
pid = chk_error(fork());
if (pid == 0) {
- client_fd = client_socket();
+ client_fd = client_socket(server_port);
send(client_fd, socket_msg, sizeof(socket_msg), 0);
close(client_fd);
exit(0);
--
2.17.1
- [Qemu-devel] [PULL 53/56] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, (continued)
- [Qemu-devel] [PULL 53/56] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 31/56] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 34/56] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 32/56] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 56/56] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 24/56] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 45/56] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 46/56] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 11/56] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 12/56] tests/tcg/multiarch: don't hard code paths/ports for linux-test,
Alex Bennée <=
- [Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 25/56] tests/tcg: enable building for AArch64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 23/56] tests/tcg: enable building for ARM, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 44/56] Makefile.target: add (clean-/build-)guest-tests targets, Alex Bennée, 2018/06/19
- Re: [Qemu-devel] [PULL 00/56] add check-tcg and associated machinery, Peter Maydell, 2018/06/20
- Re: [Qemu-devel] [PULL 00/56] add check-tcg and associated machinery, Peter Maydell, 2018/06/20