From aad21d44862ea4c3a9a11f39267976f31b786fd0 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 19 Feb 2024 17:06:28 -0600 Subject: [PATCH] Add upstream tests to run in autopkgtests Disable the su tests, since su in debian comes from util-linux. [zeha@d.o: rebase on top of upstream applied patch, rework debian/tests/*] --- debian/patches/debian/tests-disable-su.patch | 89 ++++++++++++++++++++ debian/patches/series | 1 + debian/tests/control | 6 +- debian/tests/upstream | 15 ++++ 4 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 debian/patches/debian/tests-disable-su.patch create mode 100755 debian/tests/upstream diff --git a/debian/patches/debian/tests-disable-su.patch b/debian/patches/debian/tests-disable-su.patch new file mode 100644 index 00000000..47a0659b --- /dev/null +++ b/debian/patches/debian/tests-disable-su.patch @@ -0,0 +1,89 @@ +From: Serge Hallyn +Date: Thu, 27 Jun 2024 01:23:05 +0200 +Subject: upstream testsuite: disable su tests + +Debian uses su from util-linux, pointless/impossible to test shadow's su +here. +--- + tests/tests/run_some | 68 ---------------------------------------------------- + 1 file changed, 68 deletions(-) + +diff --git a/tests/tests/run_some b/tests/tests/run_some +index 91f5626..a1e6e11 100755 +--- a/tests/tests/run_some ++++ b/tests/tests/run_some +@@ -63,74 +63,6 @@ echo "-: test failed" + find "${build_path}" -name "*.gcda" -delete + # ignore the result of the first test. ~magic~ + run_test ./su/01/su_user.test ignore_failure +-run_test ./su/01/su_user.test +-run_test ./su/01/su_root.test +-find "${build_path}" -name "*.gcda" -exec chmod a+rw {} \; +-run_test ./su/02/env_FOO-options_--login +-run_test ./su/02/env_FOO-options_--login_bash +-run_test ./su/02/env_FOO-options_--preserve-environment +-run_test ./su/02/env_FOO-options_--preserve-environment_bash +-run_test ./su/02/env_FOO-options_- +-run_test ./su/02/env_FOO-options_-_bash +-run_test ./su/02/env_FOO-options_-l-m +-run_test ./su/02/env_FOO-options_-l-m_bash +-run_test ./su/02/env_FOO-options_-l +-run_test ./su/02/env_FOO-options_-l_bash +-run_test ./su/02/env_FOO-options_-m_bash +-run_test ./su/02/env_FOO-options_-m +-run_test ./su/02/env_FOO-options_-p +-run_test ./su/02/env_FOO-options_-p_bash +-run_test ./su/02/env_FOO-options__bash +-run_test ./su/02/env_FOO-options_ +-run_test ./su/02/env_FOO-options_-p- +-run_test ./su/02/env_FOO-options_-p-_bash +-run_test ./su/02/env_special-options_-l-p +-run_test ./su/02/env_special-options_-l +-run_test ./su/02/env_special-options_-l-p_bash +-run_test ./su/02/env_special-options_-l_bash +-run_test ./su/02/env_special-options_-p +-run_test ./su/02/env_special-options_-p_bash +-run_test ./su/02/env_special-options_ +-run_test ./su/02/env_special-options__bash +-run_test ./su/02/env_special_root-options_-l-p +-run_test ./su/02/env_special_root-options_-l-p_bash +-run_test ./su/02/env_special_root-options_-l +-run_test ./su/02/env_special_root-options_-l_bash +-run_test ./su/02/env_special_root-options_-p +-run_test ./su/02/env_special_root-options_-p_bash +-run_test ./su/02/env_special_root-options_ +-run_test ./su/02/env_special_root-options__bash +-run_test ./su/03/su_run_command01.test +-run_test ./su/03/su_run_command02.test +-run_test ./su/03/su_run_command03.test +-run_test ./su/03/su_run_command04.test +-run_test ./su/03/su_run_command05.test +-run_test ./su/03/su_run_command06.test +-run_test ./su/03/su_run_command07.test +-run_test ./su/03/su_run_command08.test +-run_test ./su/03/su_run_command09.test +-run_test ./su/03/su_run_command10.test +-run_test ./su/03/su_run_command11.test +-run_test ./su/03/su_run_command12.test +-run_test ./su/03/su_run_command13.test +-run_test ./su/03/su_run_command14.test +-run_test ./su/03/su_run_command15.test +-run_test ./su/03/su_run_command16.test +-run_test ./su/03/su_run_command17.test +-run_test ./su/04/su_wrong_user.test +-run_test ./su/04/su_user_wrong_passwd.test +-run_test ./su/04/su_user_wrong_passwd_syslog.test +-run_test ./su/05/su_user_wrong_passwd_syslog.test +-run_test ./su/06/su_user_syslog.test +-run_test ./su/07/su_user_syslog.test +-run_test ./su/08/env_special-options_ +-run_test ./su/08/env_special_root-options_ +-run_test ./su/09/env_special-options_ +-run_test ./su/09/env_special_root-options_ +-run_test ./su/10_su_sulog_success/su.test +-run_test ./su/11_su_sulog_failure/su.test +-run_test ./su/12_su_child_failure/su.test +-run_test ./su/13_su_child_success/su.test + run_test ./libsubid/01_list_ranges/list_ranges.test + run_test ./libsubid/02_get_subid_owners/get_subid_owners.test + run_test ./libsubid/03_add_remove/add_remove_subids.test diff --git a/debian/patches/series b/debian/patches/series index 0ceb7ee7..b0e2c70b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ debian/Document-the-shadowconfig-utility.patch debian/Recommend-using-adduser-and-deluser.patch debian/Relax-usernames-groupnames-checking.patch upstream/tests-Support-run_some-from-exported-tarball.patch +debian/tests-disable-su.patch diff --git a/debian/tests/control b/debian/tests/control index c2b1d88d..aa898be4 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,6 @@ Tests: smoke -Restrictions: needs-root superficial +Restrictions: needs-root, superficial + +Tests: upstream +Depends: @, @builddeps@, expect, procps +Restrictions: needs-root, build-needed, breaks-testbed, allow-stderr, isolation-container diff --git a/debian/tests/upstream b/debian/tests/upstream new file mode 100755 index 00000000..fe961a65 --- /dev/null +++ b/debian/tests/upstream @@ -0,0 +1,15 @@ +#!/bin/sh +useradd ubuntu + +export BUILD_BASE_DIR=$(pwd) + +cd tests/tests + +cleanup() { + cp testsuite.log $AUTOPKGTEST_ARTIFACTS/ + cat testsuite.log +} + +trap cleanup TERM EXIT + +./run_some 2>&1