[PATCH v2 2/3] fortify: move test_fortify.sh to lib/test_fortify/

Masahiro Yamada
2024-07-27T15:03:14Z

This script is only used in lib/test_fortify/.

There is no reason to keep it in scripts/.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

(no changes since v1)

MAINTAINERS | 1 -
lib/test_fortify/Makefile | 4 ++--
{scripts => lib/test_fortify}/test_fortify.sh | 0
3 files changed, 2 insertions(+), 3 deletions(-)
rename {scripts => lib/test_fortify}/test_fortify.sh (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 85fbbc25112f..6e14bd77e3c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8758,7 +8758,6 @@ F: include/linux/fortify-string.h
F: lib/fortify_kunit.c
F: lib/memcpy_kunit.c
F: lib/test_fortify/*
-F: scripts/test_fortify.sh
K: \b__NO_FORTIFY\b

FPGA DFL DRIVERS
diff --git a/lib/test_fortify/Makefile b/lib/test_fortify/Makefile
index 3907a2242ef9..1826172c32d4 100644
--- a/lib/test_fortify/Makefile
+++ b/lib/test_fortify/Makefile
@@ -3,10 +3,10 @@
ccflags-y := $(call cc-disable-warning,fortify-source)

quiet_cmd_test_fortify = TEST $@
- cmd_test_fortify = $(CONFIG_SHELL) $(srctree)/scripts/test_fortify.sh \
+ cmd_test_fortify = $(CONFIG_SHELL) $(src)/test_fortify.sh \
$< $@ "$(NM)" $(CC) $(c_flags) -DKBUILD_EXTRA_WARN1

-$(obj)/%.log: $(src)/%.c $(srctree)/scripts/test_fortify.sh \
+$(obj)/%.log: $(src)/%.c $(src)/test_fortify.sh \
$(src)/test_fortify.h \
$(srctree)/include/linux/fortify-string.h \
FORCE
diff --git a/scripts/test_fortify.sh b/lib/test_fortify/test_fortify.sh
similarity index 100%
rename from scripts/test_fortify.sh
rename to lib/test_fortify/test_fortify.sh
--
2.43.0