From owner-p4-projects@FreeBSD.ORG Tue Nov 25 19:19:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9AA51065678; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D9EE1065673 for ; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C9E88FC17 for ; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJJ4wh000643 for ; Tue, 25 Nov 2008 19:19:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPJJ4jl000641 for perforce@freebsd.org; Tue, 25 Nov 2008 19:19:04 GMT (envelope-from trasz@freebsd.org) Date: Tue, 25 Nov 2008 19:19:04 GMT Message-Id: <200811251919.mAPJJ4jl000641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2008 19:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=153548 Change 153548 by trasz@trasz_victim7 on 2008/11/25 19:18:50 Exchange 00.t and 02.t, as 02.t has just been MFp4-ed as 00.t. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#5 (text+ko) ==== @@ -1,14 +1,15 @@ #!/bin/sh # -# This is a wrapper script to run tools-nfs4.test. +# This is a wrapper script to run tools-posix.test. # # If any of the tests fails, here is how to debug it: go to # the directory with problematic filesystem mounted on it, -# and do /path/to/test run /path/to/test tools-nfs4.test, e.g. +# and do /path/to/test run /path/to/test tools-posix.test, e.g. # -# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test # # Output should be obvious. +# echo "1..4" @@ -23,7 +24,7 @@ MD=`mdconfig -at swap -s 10m` MNT=`mktemp -dt acltools` newfs /dev/$MD > /dev/null -mount -o nfs4acls /dev/$MD $MNT +mount -o acls /dev/$MD $MNT if [ $? -ne 0 ]; then echo "not ok 1 - mount failed." exit 1 @@ -36,13 +37,13 @@ # First, check whether we can crash the kernel by creating too many # entries. For some reason this won't work in the test file. touch xxx -setfacl -x5 xxx -while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +i=0; +while :; do i=$(($i+1)); setfacl -m u:$i:rwx xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null if [ $? -eq 0 ]; then echo "ok 3" ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#5 (text+ko) ==== @@ -1,15 +1,14 @@ #!/bin/sh # -# This is a wrapper script to run tools-posix.test. +# This is a wrapper script to run tools-nfs4.test. # # If any of the tests fails, here is how to debug it: go to # the directory with problematic filesystem mounted on it, -# and do /path/to/test run /path/to/test tools-posix.test, e.g. +# and do /path/to/test run /path/to/test tools-nfs4.test, e.g. # -# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test # # Output should be obvious. -# echo "1..4" @@ -24,7 +23,7 @@ MD=`mdconfig -at swap -s 10m` MNT=`mktemp -dt acltools` newfs /dev/$MD > /dev/null -mount -o acls /dev/$MD $MNT +mount -o nfs4acls /dev/$MD $MNT if [ $? -ne 0 ]; then echo "not ok 1 - mount failed." exit 1 @@ -37,13 +36,13 @@ # First, check whether we can crash the kernel by creating too many # entries. For some reason this won't work in the test file. touch xxx -i=0; -while :; do i=$(($i+1)); setfacl -m u:$i:rwx xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +setfacl -x5 xxx +while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null if [ $? -eq 0 ]; then echo "ok 3"