1*4882a593SmuzhiyunFrom e8e8ccfd57e0274b431bc5717bf37c488285b07b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Mingli Yu <mingli.yu@windriver.com> 3*4882a593SmuzhiyunDate: Wed, 27 Oct 2021 10:30:46 +0800 4*4882a593SmuzhiyunSubject: [PATCH] run-xtests.sh: check whether files exist 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixes: 7*4882a593Smuzhiyun # ./run-xtests.sh . tst-pam_access1 8*4882a593Smuzhiyun mv: cannot stat '/etc/security/opasswd': No such file or directory 9*4882a593Smuzhiyun PASS: tst-pam_access1 10*4882a593Smuzhiyun mv: cannot stat '/etc/security/opasswd-pam-xtests': No such file or directory 11*4882a593Smuzhiyun ================== 12*4882a593Smuzhiyun 1 tests passed 13*4882a593Smuzhiyun 0 tests not run 14*4882a593Smuzhiyun ================== 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunUpstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/e8e8ccfd57e0274b431bc5717bf37c488285b07b] 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun xtests/run-xtests.sh | 20 +++++++++++++------- 21*4882a593Smuzhiyun 1 file changed, 13 insertions(+), 7 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh 24*4882a593Smuzhiyunindex 14f585d9..ff9a4dc1 100755 25*4882a593Smuzhiyun--- a/xtests/run-xtests.sh 26*4882a593Smuzhiyun+++ b/xtests/run-xtests.sh 27*4882a593Smuzhiyun@@ -18,10 +18,12 @@ all=0 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun mkdir -p /etc/security 30*4882a593Smuzhiyun for config in access.conf group.conf time.conf limits.conf ; do 31*4882a593Smuzhiyun- cp /etc/security/$config /etc/security/$config-pam-xtests 32*4882a593Smuzhiyun+ [ -f "/etc/security/$config" ] && 33*4882a593Smuzhiyun+ mv /etc/security/$config /etc/security/$config-pam-xtests 34*4882a593Smuzhiyun install -m 644 "${SRCDIR}"/$config /etc/security/$config 35*4882a593Smuzhiyun done 36*4882a593Smuzhiyun-mv /etc/security/opasswd /etc/security/opasswd-pam-xtests 37*4882a593Smuzhiyun+[ -f /etc/security/opasswd ] && 38*4882a593Smuzhiyun+ mv /etc/security/opasswd /etc/security/opasswd-pam-xtests 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun for testname in $XTESTS ; do 41*4882a593Smuzhiyun for cfg in "${SRCDIR}"/$testname*.pamd ; do 42*4882a593Smuzhiyun@@ -47,11 +49,15 @@ for testname in $XTESTS ; do 43*4882a593Smuzhiyun all=`expr $all + 1` 44*4882a593Smuzhiyun rm -f /etc/pam.d/$testname* 45*4882a593Smuzhiyun done 46*4882a593Smuzhiyun-mv /etc/security/access.conf-pam-xtests /etc/security/access.conf 47*4882a593Smuzhiyun-mv /etc/security/group.conf-pam-xtests /etc/security/group.conf 48*4882a593Smuzhiyun-mv /etc/security/time.conf-pam-xtests /etc/security/time.conf 49*4882a593Smuzhiyun-mv /etc/security/limits.conf-pam-xtests /etc/security/limits.conf 50*4882a593Smuzhiyun-mv /etc/security/opasswd-pam-xtests /etc/security/opasswd 51*4882a593Smuzhiyun+ 52*4882a593Smuzhiyun+for config in access.conf group.conf time.conf limits.conf opasswd ; do 53*4882a593Smuzhiyun+ if [ -f "/etc/security/$config-pam-xtests" ]; then 54*4882a593Smuzhiyun+ mv /etc/security/$config-pam-xtests /etc/security/$config 55*4882a593Smuzhiyun+ else 56*4882a593Smuzhiyun+ rm -f /etc/security/$config 57*4882a593Smuzhiyun+ fi 58*4882a593Smuzhiyun+done 59*4882a593Smuzhiyun+ 60*4882a593Smuzhiyun if test "$failed" -ne 0; then 61*4882a593Smuzhiyun echo "===================" 62*4882a593Smuzhiyun echo "$failed of $all tests failed" 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun2.32.0 65*4882a593Smuzhiyun 66