mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-20 16:51:37 +00:00
3bdaf5a9d8
After the commit
02c763939c10 ("test/zdtm: unify common code")
CFLAGS with -D_GNU_SOURCE defined in the top Makefile
are being passed to tests Makefiles.
As _GNU_SOURCE is also defined by tests, that resulted in
zdtm tests build failures:
make[2]: Entering directory `/home/criu/test/zdtm/lib'
CC test.o
test.c:1:0: error: "_GNU_SOURCE" redefined [-Werror]
#define _GNU_SOURCE
^
<command-line>:0:0: note: this is the location of the previous definition
cc1: all warnings being treated as errors
make[2]: *** [test.o] Error 1
However, we didn't catch this in time by Travis-CI, as zdtm.py doesn't
do `make zdtm`, rather it does `make -C test/zdtm/{lib,static,transition}`.
By calling middle makefile this way, it doesn't have _GNU_SOURCE in
CFLAGS from top-Makefile.
I think the right thing to do here - is following CRIU's way:
rely on definition of _GNU_SOURCE by Makefiles.
This patch is almost fully generated with
find test/zdtm/ -name '*.c' -type f \
-exec sed -i '/define _GNU_SOURCE/{n;/^$/d;}' '{}' \; \
-exec sed -i '/define _GNU_SOURCE/d' '{}' \;
With an exception for adding -D_GNU_SOURCE in tests Makefile.inc for
keeping the same behaviour for zdtm.py.
Also changed utsname.c to use utsname::domainname, rather private
utsname::__domainname, as now it's uncovered (from sys/utsname.h):
> struct utsname
> {
...
> # ifdef __USE_GNU
> char domainname[_UTSNAME_DOMAIN_LENGTH];
> # else
> char __domainname[_UTSNAME_DOMAIN_LENGTH];
> # endif
Reported-by: Adrian Reber <areber@redhat.com>
Cc: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
137 lines
3 KiB
C
137 lines
3 KiB
C
#include <sched.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/sem.h>
|
|
#include <sys/ipc.h>
|
|
#include <sys/msg.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
#include "zdtmtst.h"
|
|
|
|
const char *test_doc="Tests sysv5 msg queues supporting by checkpointing";
|
|
const char *test_author="Stanislav Kinsbursky <skinsbursky@openvz.org>";
|
|
|
|
struct msg1 {
|
|
long mtype;
|
|
char mtext[30];
|
|
};
|
|
#define TEST_STRING "Test sysv5 msg"
|
|
#define MSG_TYPE 1
|
|
|
|
#define ANOTHER_TEST_STRING "Yet another test sysv5 msg"
|
|
#define ANOTHER_MSG_TYPE 26538
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
key_t key;
|
|
int msg, pid;
|
|
struct msg1 msgbuf;
|
|
int chret;
|
|
|
|
test_init(argc, argv);
|
|
|
|
key = ftok(argv[0], 822155650);
|
|
if (key == -1) {
|
|
pr_perror("Can't make key");
|
|
exit(1);
|
|
}
|
|
|
|
pid = test_fork();
|
|
if (pid < 0) {
|
|
pr_perror("Can't fork");
|
|
exit(1);
|
|
}
|
|
|
|
msg = msgget(key, IPC_CREAT | IPC_EXCL | 0666);
|
|
if (msg == -1) {
|
|
msg = msgget(key, 0666);
|
|
if (msg == -1) {
|
|
pr_perror("Can't get queue");
|
|
goto err_kill;
|
|
}
|
|
}
|
|
|
|
if (pid == 0) {
|
|
test_waitsig();
|
|
|
|
if (msgrcv(msg, &msgbuf, sizeof(TEST_STRING), MSG_TYPE, IPC_NOWAIT) == -1) {
|
|
fail("Child: msgrcv failed (%m)");
|
|
return -errno;
|
|
}
|
|
|
|
if (strncmp(TEST_STRING, msgbuf.mtext, sizeof(TEST_STRING))) {
|
|
fail("Child: the source and received strings aren't equal");
|
|
return -errno;
|
|
}
|
|
test_msg("Child: received %s\n", msgbuf.mtext);
|
|
|
|
msgbuf.mtype = ANOTHER_MSG_TYPE;
|
|
memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING));
|
|
if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), IPC_NOWAIT) != 0) {
|
|
fail("Child: msgsnd failed (%m)");
|
|
return -errno;
|
|
};
|
|
pass();
|
|
return 0;
|
|
} else {
|
|
msgbuf.mtype = MSG_TYPE;
|
|
memcpy(msgbuf.mtext, TEST_STRING, sizeof(TEST_STRING));
|
|
if (msgsnd(msg, &msgbuf, sizeof(TEST_STRING), IPC_NOWAIT) != 0) {
|
|
fail("Parent: msgsnd failed (%m)");
|
|
goto err_kill;
|
|
};
|
|
|
|
msgbuf.mtype = ANOTHER_MSG_TYPE;
|
|
memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING));
|
|
if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), IPC_NOWAIT) != 0) {
|
|
fail("child: msgsnd (2) failed (%m)");
|
|
return -errno;
|
|
};
|
|
|
|
test_daemon();
|
|
test_waitsig();
|
|
|
|
kill(pid, SIGTERM);
|
|
|
|
wait(&chret);
|
|
chret = WEXITSTATUS(chret);
|
|
if (chret) {
|
|
fail("Parent: child exited with non-zero code %d (%s)\n",
|
|
chret, strerror(chret));
|
|
goto out;
|
|
}
|
|
|
|
if (msgrcv(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), ANOTHER_MSG_TYPE, IPC_NOWAIT) == -1) {
|
|
fail("Parent: msgrcv failed (%m)");
|
|
goto err;
|
|
}
|
|
|
|
if (strncmp(ANOTHER_TEST_STRING, msgbuf.mtext, sizeof(ANOTHER_TEST_STRING))) {
|
|
fail("Parent: the source and received strings aren't equal");
|
|
goto err;
|
|
}
|
|
test_msg("Parent: received %s\n", msgbuf.mtext);
|
|
|
|
pass();
|
|
}
|
|
|
|
out:
|
|
if (msgctl(msg, IPC_RMID, 0)) {
|
|
fail("Failed to destroy message queue: %d\n", -errno);
|
|
return -errno;
|
|
}
|
|
return chret;
|
|
|
|
err_kill:
|
|
kill(pid, SIGKILL);
|
|
wait(NULL);
|
|
err:
|
|
chret = -errno;
|
|
goto out;
|
|
}
|