This reverts commit 708b04bfccb2401805e1a796375d919e89546c05. We will fix the problem in another way: will disable hardening flags provided by rpmbuild.
https://virtuozzo.atlassian.net/browse/VSTOR-123250 https://virtuozzo.atlassian.net/browse/VSTOR-125165 Signed-off-by: Konstantin Khorenko <[email protected]> Feature: fix selftests --- tools/testing/selftests/efivarfs/Makefile | 2 +- tools/testing/selftests/exec/Makefile | 2 +- tools/testing/selftests/filesystems/overlayfs/Makefile | 2 +- tools/testing/selftests/firmware/Makefile | 4 ++-- tools/testing/selftests/ipc/Makefile | 4 ++-- tools/testing/selftests/mount/Makefile | 4 ++-- tools/testing/selftests/mount_setattr/Makefile | 2 +- tools/testing/selftests/move_mount_set_group/Makefile | 2 +- tools/testing/selftests/nsfs/Makefile | 2 +- tools/testing/selftests/resctrl/Makefile | 2 +- tools/testing/selftests/safesetid/Makefile | 2 +- tools/testing/selftests/sigaltstack/Makefile | 2 +- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/tty/Makefile | 2 +- tools/testing/selftests/vDSO/Makefile | 2 +- tools/testing/selftests/ve_printk/Makefile | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/efivarfs/Makefile b/tools/testing/selftests/efivarfs/Makefile index f6c412059af3..e3181338ba5e 100644 --- a/tools/testing/selftests/efivarfs/Makefile +++ b/tools/testing/selftests/efivarfs/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -CFLAGS += -Wall +CFLAGS = -Wall TEST_GEN_FILES := open-unlink create-read TEST_PROGS := efivarfs.sh diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile index e0d3f7cbf54c..ba012bc5aab9 100644 --- a/tools/testing/selftests/exec/Makefile +++ b/tools/testing/selftests/exec/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -Wall +CFLAGS = -Wall CFLAGS += -Wno-nonnull ALIGNS := 0x1000 0x200000 0x1000000 diff --git a/tools/testing/selftests/filesystems/overlayfs/Makefile b/tools/testing/selftests/filesystems/overlayfs/Makefile index f87b34c4c244..56b2b48a765b 100644 --- a/tools/testing/selftests/filesystems/overlayfs/Makefile +++ b/tools/testing/selftests/filesystems/overlayfs/Makefile @@ -2,6 +2,6 @@ TEST_GEN_PROGS := dev_in_maps -CFLAGS += -Wall -Werror +CFLAGS := -Wall -Werror include ../../lib.mk diff --git a/tools/testing/selftests/firmware/Makefile b/tools/testing/selftests/firmware/Makefile index dd9acf972cf5..7992969deaa2 100644 --- a/tools/testing/selftests/firmware/Makefile +++ b/tools/testing/selftests/firmware/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only # Makefile for firmware loading selftests -CFLAGS += -Wall \ - -O2 +CFLAGS = -Wall \ + -O2 TEST_PROGS := fw_run_tests.sh TEST_FILES := fw_fallback.sh fw_filesystem.sh fw_upload.sh fw_lib.sh diff --git a/tools/testing/selftests/ipc/Makefile b/tools/testing/selftests/ipc/Makefile index 6742a4d2cc81..23be4dbbfdb0 100644 --- a/tools/testing/selftests/ipc/Makefile +++ b/tools/testing/selftests/ipc/Makefile @@ -3,11 +3,11 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) override ARCH := $(shell echo $(ARCH) | sed -e s/i.86/i386/) ifeq ($(ARCH),i386) override ARCH := x86 - CFLAGS += -DCONFIG_X86_32 -D__i386__ + CFLAGS := -DCONFIG_X86_32 -D__i386__ endif ifeq ($(ARCH),x86_64) override ARCH := x86 - CFLAGS += -DCONFIG_X86_64 -D__x86_64__ + CFLAGS := -DCONFIG_X86_64 -D__x86_64__ endif CFLAGS += $(KHDR_INCLUDES) diff --git a/tools/testing/selftests/mount/Makefile b/tools/testing/selftests/mount/Makefile index 38361a896363..2d9454841644 100644 --- a/tools/testing/selftests/mount/Makefile +++ b/tools/testing/selftests/mount/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for mount selftests. -CFLAGS += -Wall \ - -O2 +CFLAGS = -Wall \ + -O2 TEST_PROGS := run_unprivileged_remount.sh run_nosymfollow.sh TEST_GEN_FILES := unprivileged-remount-test nosymfollow-test diff --git a/tools/testing/selftests/mount_setattr/Makefile b/tools/testing/selftests/mount_setattr/Makefile index f5eb8d8223d7..0c0d7b1234c1 100644 --- a/tools/testing/selftests/mount_setattr/Makefile +++ b/tools/testing/selftests/mount_setattr/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for mount selftests. -CFLAGS += -g $(KHDR_INCLUDES) -Wall -O2 -pthread +CFLAGS = -g $(KHDR_INCLUDES) -Wall -O2 -pthread TEST_GEN_PROGS := mount_setattr_test diff --git a/tools/testing/selftests/move_mount_set_group/Makefile b/tools/testing/selftests/move_mount_set_group/Makefile index 8771a5491ea3..94235846b6f9 100644 --- a/tools/testing/selftests/move_mount_set_group/Makefile +++ b/tools/testing/selftests/move_mount_set_group/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for mount selftests. -CFLAGS += -g $(KHDR_INCLUDES) -Wall -O2 +CFLAGS = -g $(KHDR_INCLUDES) -Wall -O2 TEST_GEN_FILES += move_mount_set_group_test diff --git a/tools/testing/selftests/nsfs/Makefile b/tools/testing/selftests/nsfs/Makefile index b51379b3f35c..dd9bd50b7b93 100644 --- a/tools/testing/selftests/nsfs/Makefile +++ b/tools/testing/selftests/nsfs/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only TEST_GEN_PROGS := owner pidns -CFLAGS += -Wall -Werror +CFLAGS := -Wall -Werror include ../lib.mk diff --git a/tools/testing/selftests/resctrl/Makefile b/tools/testing/selftests/resctrl/Makefile index f38b45b773d0..f408bd6bfc3d 100644 --- a/tools/testing/selftests/resctrl/Makefile +++ b/tools/testing/selftests/resctrl/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -g -Wall -O2 -D_FORTIFY_SOURCE=2 +CFLAGS = -g -Wall -O2 -D_FORTIFY_SOURCE=2 CFLAGS += $(KHDR_INCLUDES) TEST_GEN_PROGS := resctrl_tests diff --git a/tools/testing/selftests/safesetid/Makefile b/tools/testing/selftests/safesetid/Makefile index d3811515d8e3..e815bbf2d0f4 100644 --- a/tools/testing/selftests/safesetid/Makefile +++ b/tools/testing/selftests/safesetid/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for SafeSetID selftest. -CFLAGS += -Wall -O2 +CFLAGS = -Wall -O2 LDLIBS = -lcap TEST_PROGS := safesetid-test.sh diff --git a/tools/testing/selftests/sigaltstack/Makefile b/tools/testing/selftests/sigaltstack/Makefile index 5b41d660143c..3e96d5d47036 100644 --- a/tools/testing/selftests/sigaltstack/Makefile +++ b/tools/testing/selftests/sigaltstack/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -CFLAGS += -Wall +CFLAGS = -Wall TEST_GEN_PROGS = sas include ../lib.mk diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index 357077792395..f0d51d4d2c87 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,7 +1,7 @@ TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec futex vfork_exec TEST_GEN_PROGS_EXTENDED := gettime_perf -CFLAGS += -Wall -Werror -pthread +CFLAGS := -Wall -Werror -pthread LDLIBS := -lrt -ldl include ../lib.mk diff --git a/tools/testing/selftests/tty/Makefile b/tools/testing/selftests/tty/Makefile index 03cb8de7e20e..50d7027b2ae3 100644 --- a/tools/testing/selftests/tty/Makefile +++ b/tools/testing/selftests/tty/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -O2 -Wall +CFLAGS = -O2 -Wall TEST_GEN_PROGS := tty_tstamp_update include ../lib.mk diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index 9e6bd936960f..1cf14a8da438 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -12,7 +12,7 @@ TEST_GEN_PROGS += vdso_test_correctness TEST_GEN_PROGS += vdso_test_getrandom TEST_GEN_PROGS += vdso_test_chacha -CFLAGS += -std=gnu99 -O2 +CFLAGS := -std=gnu99 -O2 ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s diff --git a/tools/testing/selftests/ve_printk/Makefile b/tools/testing/selftests/ve_printk/Makefile index 9e171908c237..e3edcbacda1e 100644 --- a/tools/testing/selftests/ve_printk/Makefile +++ b/tools/testing/selftests/ve_printk/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for ve_printk selftests. -CFLAGS += -g -I../../../../usr/include/ -Wall -O2 +CFLAGS = -g -I../../../../usr/include/ -Wall -O2 TEST_GEN_PROGS += ve_printk_test TEST_GEN_FILES += test_segf test_trap -- 2.47.1 _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
