[Pvfs2-cvs] commit by pcarns in pvfs2-1/test/automated/vfs-tests.d: ltp-20080630-accept4-wrapper.patch ltp

CVS commit program cvs at parl.clemson.edu
Tue Feb 2 16:51:16 EST 2010


Update of /projects/cvsroot/pvfs2-1/test/automated/vfs-tests.d
In directory parlweb1:/tmp/cvs-serv5872

Modified Files:
	ltp 
Added Files:
	ltp-20080630-accept4-wrapper.patch 
Log Message:
minor patch to the version of LTP we are using for nightly testing to keep
it from conflicting with the new accept4() library call


--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ ltp-20080630-accept4-wrapper.patch	2010-02-02 16:51:16.000000000 -0500
@@ -0,0 +1,21 @@
+diff -Naupr ltp-full-20081130/testcases/kernel/syscalls/accept4/accept4_01.c ltp-full-20081130-mod/testcases/kernel/syscalls/accept4/accept4_01.c
+--- ltp-full-20081130/testcases/kernel/syscalls/accept4/accept4_01.c	2008-11-19 04:34:38.000000000 -0600
++++ ltp-full-20081130-mod/testcases/kernel/syscalls/accept4/accept4_01.c	2010-02-02 15:40:12.000000000 -0600
+@@ -147,7 +147,7 @@ setup()
+ 
+ 
+ static int
+-accept4(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
++accept4_internal(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
+ {
+ #ifdef DEBUG
+    tst_resm(TINFO, "Calling accept4(): flags = %x", flags);
+@@ -202,7 +202,7 @@ do_test(int lfd, struct sockaddr_in *con
+        die("Connect Error");
+ 
+    addrlen = sizeof(struct sockaddr_in);
+-   acceptfd = accept4(lfd, (struct sockaddr *) &claddr, &addrlen,
++   acceptfd = accept4_internal(lfd, (struct sockaddr *) &claddr, &addrlen,
+                       closeonexec_flag | nonblock_flag);
+    if (acceptfd == -1)
+        die("accept4() Error");

Index: ltp
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/automated/vfs-tests.d/ltp,v
diff -p -u -r1.10 -r1.11
--- ltp	16 Dec 2008 21:49:20 -0000	1.10
+++ ltp	2 Feb 2010 21:51:16 -0000	1.11
@@ -28,7 +28,8 @@ fi
 # fix some pvfs specific problems
 cd ltp-full-${LTPVER}
 for patch in \
-	${VFS_SCRIPTS}/ltp-20080630-zoo-path.patch ; do
+	${VFS_SCRIPTS}/ltp-20080630-zoo-path.patch \
+        ${VFS_SCRIPTS}/ltp-20080630-accept4-wrapper.patch; do
 		patch -p1 < $patch
 done
 if [ "${?}" != 0 ]



More information about the Pvfs2-cvs mailing list