From: James Nunez <jnunez@whamcloud.com>
Date: Fri, 31 May 2019 21:28:20 +0000 (-0600)
Subject: LU-12267 tests: filter trailing '.' for SELinux
X-Git-Tag: 2.12.55~3
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=f000996069acc7d535b7574a9d9a4ab65e753ff0;ds=sidebyside

LU-12267 tests: filter trailing '.' for SELinux

When SELinux is enforced, sanity test 420 fails due to
the "ls -n" command producing an extra '.' at the end of
the file/directory permissions to indicate extra security
attributes are set.

We need to filter out the trailing '.' in the 'ls -n'
output for testing to pass when SELinux is enabled.

Test-Parameters: trivial envdefinitions=ONLY=420 testlist=sanity
Test-Parameters: clientselinux envdefinitions=ONLY=420 testlist=sanity
Signed-off-by: James Nunez <jnunez@whamcloud.com>
Change-Id: I4a2f199d2ef4a7b1b6a1b381041b384bb0077cc6
Reviewed-on: https://review.whamcloud.com/35026
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 579899f..12cc892 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -20313,14 +20313,17 @@ test_420()
 	umask 0000
 	mkdir -m03777 $dir/testdir
 	ls -dn $dir/testdir
-	local dirperms=$(ls -dn $dir/testdir | awk '{print $1}')
+	# Need to remove trailing '.' when SELinux is enabled
+	local dirperms=$(ls -dn $dir/testdir |
+			 awk '{ sub(/\.$/, "", $1); print $1}')
 	[ $dirperms == "drwxrwsrwt" ] ||
 		error "incorrect perms on $dir/testdir"
 
 	su - $uname -c "PATH=$LUSTRE/tests:\$PATH; \
 		openfile -f O_RDONLY:O_CREAT -m 02755 $dir/testdir/testfile"
 	ls -n $dir/testdir/testfile
-	local fileperms=$(ls -n $dir/testdir/testfile | awk '{print $1}')
+	local fileperms=$(ls -n $dir/testdir/testfile |
+			  awk '{ sub(/\.$/, "", $1); print $1}')
 	[ $fileperms == "-rwxr-xr-x" ] ||
 		error "incorrect perms on $dir/testdir/testfile"