[Pvfs2-cvs] commit by nlmills in pvfs2/test/automated/vfs-tests.d: dbench.sav ltp-20080630-accept4-wrapper.patch fsx.c ltp dbench

CVS commit program cvs at parl.clemson.edu
Fri Jun 18 20:02:29 EDT 2010


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

Modified Files:
      Tag: cu-security-branch
	fsx.c ltp 
Added Files:
      Tag: cu-security-branch
	dbench.sav ltp-20080630-accept4-wrapper.patch 
Removed Files:
      Tag: cu-security-branch
	dbench 
Log Message:
initial merge with Orange-Branch. much will be broken


--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ dbench.sav	2010-06-18 20:02:29.000000000 -0400
@@ -0,0 +1,8 @@
+#!/bin/sh
+#changed permissions
+#copied from dbench
+cd ${EXTRA_TESTS}/dbench-3.03
+./configure -q
+make 2>&1
+cp client.txt ${PVFS2_MOUNTPOINT}
+cd ${PVFS2_MOUNTPOINT} &&  ${EXTRA_TESTS}/dbench-3.03/dbench -c client.txt 10 -t 300  2>&1

--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ ltp-20080630-accept4-wrapper.patch	2010-06-18 20:02:29.000000000 -0400
@@ -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: fsx.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/vfs-tests.d/fsx.c,v
diff -p -u -r1.1 -r1.1.50.1
--- fsx.c	12 Jan 2006 20:54:04 -0000	1.1
+++ fsx.c	19 Jun 2010 00:02:29 -0000	1.1.50.1
@@ -116,9 +116,13 @@ prt(char *fmt, ...)
 
 	va_start(args, fmt);
 	vfprintf(stdout, fmt, args);
-	if (fsxlogf)
-		vfprintf(fsxlogf, fmt, args);
 	va_end(args);
+	if (fsxlogf)
+	{
+	   va_start(args,fmt);
+	   vfprintf(fsxlogf, fmt, args);
+	   va_end(args);
+	}
 }
 
 void
@@ -954,6 +958,8 @@ main(int argc, char **argv)
 			break;
                 case 'R':
                         mapped_reads = 0;
+			if (!quiet)
+			   fprintf(stdout, "mapped reads DISABLED\n");
                         break;
 		case 'S':
                         seed = getnum(optarg, &endp);

Index: ltp
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/vfs-tests.d/ltp,v
diff -p -u -r1.10.30.1 -r1.10.30.2
--- ltp	2 Sep 2009 20:16:22 -0000	1.10.30.1
+++ ltp	19 Jun 2010 00:02:29 -0000	1.10.30.2
@@ -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 ]

--- dbench	2010-06-18 20:02:29.000000000 -0400
+++ /dev/null	2004-06-24 14:04:38.000000000 -0400
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd ${EXTRA_DIRS}/dbench-3.03
-./configure -q
-make 2>&1
-cp client.txt ${PVFS2_MOUNTPOINT}
-cd ${PVFS2_MOUNTPOINT} &&  ${EXTRA_DIRS}/dbench-3.03/dbench -c client.txt 10 -t 300  2>&1



More information about the Pvfs2-cvs mailing list