From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sat, 27 Jul 2024 15:02:37 +0000 (+0900)
Subject: fortify: move test_fortify.sh to lib/test_fortify/
X-Git-Tag: v6.12-rc1~151^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a8d0c46c9e024bed4805a9335fe6124d8a78d3a;p=thirdparty%2Fkernel%2Flinux.git

fortify: move test_fortify.sh to lib/test_fortify/

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>
Link: https://lore.kernel.org/r/20240727150302.1823750-3-masahiroy@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 8766f3e5e87e0..36c0af94cf086 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8772,7 +8772,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 3907a2242ef9e..1826172c32d4a 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