build: relinking workaround for Kconfig

When COMPILE_TEST gets added to Kconfig (presumably among other things) the modules will get re-linked. Signed-off-by: Jakub Kicinski <[email protected]>
kuba-moo · Jul 12, 2024 · 5bcb890 · 5bcb890
1 parent 1252818
commit 5bcb890
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tests/patch/build_32bit/build_32bit.sh b/tests/patch/build_32bit/build_32bit.sh
@@ -49,7 +49,8 @@ fi
 # the "before", too.
 touch_relink=/dev/null
 if ! git log --diff-filter=A HEAD~.. --exit-code >>/dev/null || \
-   git diff --name-only HEAD~ | grep -q -E "Makefile$"
+   git diff --name-only HEAD~ | grep -q -E "Makefile$" || \
+   git diff --name-only HEAD~ | grep -q -E "Kconfig$"
 then
     echo "Trying to force re-linking, new files were added"
     touch_relink=${output_dir}/include/generated/utsrelease.h

diff --git a/tests/patch/build_allmodconfig_warn/build_allmodconfig.sh b/tests/patch/build_allmodconfig_warn/build_allmodconfig.sh
@@ -49,7 +49,8 @@ fi
 # the "before", too.
 touch_relink=/dev/null
 if ! git log --diff-filter=A HEAD~.. --exit-code >>/dev/null || \
-   git diff --name-only HEAD~ | grep -q -E "Makefile$"
+   git diff --name-only HEAD~ | grep -q -E "Makefile$" || \
+   git diff --name-only HEAD~ | grep -q -E "Kconfig$"
 then
     echo "Trying to force re-linking, new files were added"
     touch_relink=${output_dir}/include/generated/utsrelease.h

diff --git a/tests/patch/build_clang/build_clang.sh b/tests/patch/build_clang/build_clang.sh
@@ -42,7 +42,8 @@ fi
 # the "before", too.
 touch_relink=/dev/null
 if ! git log --diff-filter=A HEAD~.. --exit-code >>/dev/null || \
-   git diff --name-only HEAD~ | grep -q -E "Makefile$"
+   git diff --name-only HEAD~ | grep -q -E "Makefile$" || \
+   git diff --name-only HEAD~ | grep -q -E "Kconfig$"
 then
     echo "Trying to force re-linking, new files were added"
     touch_relink=${output_dir}/include/generated/utsrelease.h