LU-17734 build: Debian: oblige --disable-tests if asked

Do not disable tests by default for debian-based builds, but permit
users to disable them if they choose by passing in --disable-tests.

Test-Parameters: trivial
Signed-off-by: Ellis Wilson <elliswilson@microsoft.com>
Change-Id: I90088e6e95fa9e46ae063dfc061a324293fde9a2
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54764
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/autoMakefile.am b/autoMakefile.am
index b3c8186..66064c3 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -457,6 +457,9 @@ debs: undef.h debs_common
        elif test "x@ENABLE_EFENCE@" = "xno"; then \
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} noefence"; \
        fi; \
+       if test "x@TESTS_FALSE@" = "x"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} notests"; \
+       fi; \
        export KERNEL_OBJ="$(LINUX_OBJ)"; \
        export KERNEL_SRC="$(LINUX)"; \
        echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \

diff --git a/debian/rules b/debian/rules
index a5c8b9b..4cbc3d3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -533,6 +533,9 @@ kdist_config: prep-deb-files patch-stamp
                        export EXTRAFLAGS="$${EXTRAFLAGS} --disable-$${option}"; \
                fi; \
        done; \
+       if echo "$${DEB_BUILD_PROFILES}" | grep -q "notests"; then \
+               export EXTRAFLAGS="$${EXTRAFLAGS} --disable-tests"; \
+       fi; \
        if [ -f "$${CONFIG_CACHE_FILE}" ]; then \
                export TMP_CACHE_FILE=$$(mktemp --tmpdir newconfig-XXXXXXXX.cache); \
                sed -e "/ac_cv_env/d" \
@@ -547,7 +550,6 @@ kdist_config: prep-deb-files patch-stamp
                --disable-dependency-tracking \
                --disable-doc  \
                --disable-iokit \
-               --disable-tests \
                --enable-quota \
                --with-kmp-moddir=updates/kernel \
                $${EXTRAFLAGS} \