From c4e36dc14ed6eef1d0e63d2de924e4696173d72f Mon Sep 17 00:00:00 2001 From: JayRJoshi Date: Thu, 24 Mar 2016 00:43:13 +0530 Subject: [PATCH] tests/scm_rights-fd.test: fix pathname regex Pathname containing >, }, or non-printable characters was resulting in failing of the test. * tests/scm_rights-fd.test: Fix pathname regex and simplify things. --- tests/scm_rights-fd.test | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/scm_rights-fd.test b/tests/scm_rights-fd.test index 48c5028b..d09137f0 100755 --- a/tests/scm_rights-fd.test +++ b/tests/scm_rights-fd.test @@ -51,16 +51,25 @@ touch -- "$file" || run_prog ./scm_rights /dev/zero run_strace -y -x -enetwork $args "$file" -sample='\\xf1\\xf2\\xf3\\xf4\\xf5\\xf6\\xf7\\xf8\\xf9\\xfa\\xfb\\xfc\\xfd\\xfe\\xff' +hex='[[:xdigit:]]' n='[1-9][0-9]*' -msg='\{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"'"$sample"'", 15\}\], msg_controllen='"$n" -rights='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \[4, 5, 6]*/(A\\n){127}Z>\]\}' -creds='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, \{pid='"$n"', uid=[0-9]+, gid=[0-9]+\}\}' +sample="$(for i in $(seq 1 15); do printf '\\\\xf%x' $i; done)" +socket='' + +path6='(/.*/(A\\n){127}Z|\\x2f(\\x'"$hex$hex"')*\\x2f(\\x41\\x0a){127}\\x5a)' +rights_data='\[4, 5, 6<'"$path6"'>\]' +iov='\[\{"'"$sample"'", 15\}\]' +ids='\{pid='"$n"', uid=[0-9]+, gid=[0-9]+\}' + +msg='\{msg_name\(0\)=NULL, msg_iov\(1\)='"$iov"', msg_controllen='"$n" +rights='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, '"$rights_data"'\}' +creds='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, '"$ids"'\}' + EXPECTED="$LOG.expected" cat > "$EXPECTED" << __EOF__ -sendmsg\\(3, $msg, \\[$rights\\], msg_flags=0\\}, 0\\) = 15 -recvmsg\\(0, $msg, \\[$creds, $rights\\], msg_flags=0\\}, 0\\) = 15 +sendmsg\\(3$socket, $msg, \\[$rights\\], msg_flags=0\\}, 0\\) = 15 +recvmsg\\(0$socket, $msg, \\[$creds, $rights\\], msg_flags=0\\}, 0\\) = 15 __EOF__ match_grep "$LOG" "$EXPECTED" -- 2.50.1