From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 30 May 2014 15:18:00 +0000 (+0000)
Subject: tests: fix SCM_RIGHTS test for big-endian systems
X-Git-Tag: v4.9~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e25fb4fd8eb2ec0962cfac614e85762d7f9dbd38;p=strace

tests: fix SCM_RIGHTS test for big-endian systems

* tests/scm_rights.c (main): Send zero integer to avoid issues with
endianness.
* tests/scm_rights-fd.test: Update grep patterns.
---

diff --git a/tests/scm_rights-fd.test b/tests/scm_rights-fd.test
index e0b8f4a7..5a847dac 100755
--- a/tests/scm_rights-fd.test
+++ b/tests/scm_rights-fd.test
@@ -37,7 +37,7 @@ grep_log()
 	}
 }
 
-grep_log sendmsg '\(1<socket:\[[0-9]+\]>, \{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"\\x03\\x00\\x00\\x00[^"]*", [1-9][0-9]*\}\], msg_controllen=[1-9][0-9]*, \{cmsg_len=[1-9][0-9]*, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \{3</dev/null>\}\}, msg_flags=0\}, 0\) += [1-9][0-9]*'
-grep_log recvmsg '\(0<socket:\[[0-9]+\]>, \{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"\\x03\\x00\\x00\\x00[^"]*", [1-9][0-9]*\}\], msg_controllen=[1-9][0-9]*, \{cmsg_len=[1-9][0-9]*, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \{3</dev/null>\}\}, msg_flags=0\}, 0\) += [1-9][0-9]*'
+grep_log sendmsg '\(1<socket:\[[0-9]+\]>, \{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"\\x00\\x00\\x00\\x00[^"]*", [1-9][0-9]*\}\], msg_controllen=[1-9][0-9]*, \{cmsg_len=[1-9][0-9]*, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \{3</dev/null>\}\}, msg_flags=0\}, 0\) += [1-9][0-9]*'
+grep_log recvmsg '\(0<socket:\[[0-9]+\]>, \{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"\\x00\\x00\\x00\\x00[^"]*", [1-9][0-9]*\}\], msg_controllen=[1-9][0-9]*, \{cmsg_len=[1-9][0-9]*, cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \{3</dev/null>\}\}, msg_flags=0\}, 0\) += [1-9][0-9]*'
 
 exit 0
diff --git a/tests/scm_rights.c b/tests/scm_rights.c
index 9522ba14..0cced9be 100644
--- a/tests/scm_rights.c
+++ b/tests/scm_rights.c
@@ -15,8 +15,9 @@ int main(void)
 	} control = {};
 
 	int fd;
+	int data = 0;
 	struct iovec iov = {
-		.iov_base = &fd,
+		.iov_base = &data,
 		.iov_len = sizeof(iov)
 	};