Commit 3bdaf5a9 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Andrei Vagin

zdtm: rely on -D_GNU_SOURCE passed from Makefiles

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: 's avatarAdrian Reber <areber@redhat.com>
Cc: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 70ac7a10
......@@ -23,6 +23,7 @@ SRCARCH ?= $(ARCH)
CC := gcc
CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += $(USERCFLAGS)
CFLAGS += -D_GNU_SOURCE
CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include
ifeq ($(strip $(V)),)
......
#define _GNU_SOURCE
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
......
#define _GNU_SOURCE
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdbool.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdbool.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <stdlib.h>
#include <syscall.h>
#include <pthread.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <stdlib.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <alloca.h>
#include <unistd.h>
#include <stdbool.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <errno.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <limits.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <errno.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <errno.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <sys/file.h>
#include <unistd.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <sys/file.h>
#include <unistd.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <sys/wait.h>
#include <sys/file.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdlib.h>
#include <stdbool.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <limits.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <limits.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <limits.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <stdbool.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <stdio.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <errno.h>
......
#define _GNU_SOURCE
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <stdio.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdlib.h>
#include <sys/wait.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <sys/mman.h>
#include <sched.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <sys/mman.h>
#include <sched.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <sys/mman.h>
#include <sys/types.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <stdio.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <unistd.h>
#include <errno.h>
......
#define _GNU_SOURCE
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <sys/socket.h>
#include <sys/types.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include "zdtmtst.h"
#ifdef ZDTM_IPV6
......
#define _GNU_SOURCE
#include <errno.h>
#include <stdlib.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <stdlib.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
......
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
......
......@@ -36,7 +36,7 @@ int main(int argc, char **argv)
fail("Nodename doesn't match");
return 1;
}
if (strcmp(ZDTM_DOMAIN, after.__domainname)) {
if (strcmp(ZDTM_DOMAIN, after.domainname)) {
fail("Domainname doesn't match");
return 1;
}
......
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
#define _GNU_SOURCE
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
......
#define _GNU_SOURCE
#include <sched.h>
#include <stdio.h>
......
#define _GNU_SOURCE
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
......
#define _GNU_SOURCE
#include <errno.h>
#include <stdlib.h>
#include <string.h>
......
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