Module Name:    src
Committed By:   bouyer
Date:           Wed Mar  9 19:04:58 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/fs/ffs: t_clearquota.sh t_getquota.sh t_miscquota.sh
            t_quotalimit.sh t_setquota.sh
Removed Files:
        src/tests/fs/ffs/clients: Makefile quota_rumpops.c

Log Message:
Use librumphijack for quota commands instead of rumpifed versions.


To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/t_clearquota.sh \
    src/tests/fs/ffs/t_getquota.sh src/tests/fs/ffs/t_miscquota.sh \
    src/tests/fs/ffs/t_quotalimit.sh src/tests/fs/ffs/t_setquota.sh
cvs rdiff -u -r1.3 -r0 src/tests/fs/ffs/clients/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/fs/ffs/clients/quota_rumpops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.261 src/distrib/sets/lists/tests/mi:1.262
--- src/distrib/sets/lists/tests/mi:1.261	Tue Mar  8 12:42:14 2011
+++ src/distrib/sets/lists/tests/mi	Wed Mar  9 19:04:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.261 2011/03/08 12:42:14 pooka Exp $
+# $NetBSD: mi,v 1.262 2011/03/09 19:04:57 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1193,10 +1193,10 @@
 ./usr/tests/fs/ffs/Atffile			tests-fs-tests		atf
 ./usr/tests/fs/ffs/h_quota2_server		tests-fs-tests		atf
 ./usr/tests/fs/ffs/h_quota2_tests		tests-fs-tests		atf
-./usr/tests/fs/ffs/rump_edquota			tests-fs-tests		atf
-./usr/tests/fs/ffs/rump_quota			tests-fs-tests		atf
-./usr/tests/fs/ffs/rump_quotactl		tests-fs-tests		atf
-./usr/tests/fs/ffs/rump_repquota		tests-fs-tests		atf
+./usr/tests/fs/ffs/rump_edquota			tests-obsolete		obsolete
+./usr/tests/fs/ffs/rump_quota			tests-obsolete		obsolete
+./usr/tests/fs/ffs/rump_quotactl		tests-obsolete		obsolete
+./usr/tests/fs/ffs/rump_repquota		tests-obsolete		obsolete
 ./usr/tests/fs/ffs/t_fifos			tests-fs-tests		atf
 ./usr/tests/fs/ffs/t_mount			tests-fs-tests		atf
 ./usr/tests/fs/ffs/t_renamerace			tests-obsolete		obsolete

Index: src/tests/fs/ffs/t_clearquota.sh
diff -u src/tests/fs/ffs/t_clearquota.sh:1.2 src/tests/fs/ffs/t_clearquota.sh:1.3
--- src/tests/fs/ffs/t_clearquota.sh:1.2	Sun Mar  6 17:08:40 2011
+++ src/tests/fs/ffs/t_clearquota.sh	Wed Mar  9 19:04:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_clearquota.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $ 
+# $NetBSD: t_clearquota.sh,v 1.3 2011/03/09 19:04:58 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -67,17 +67,17 @@
 #set and check the expected quota
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
 		   -t 2W/3D ${id}
 		atf_check -s exit:0 \
 -o "match:/mnt        0       10    40960  2weeks       0      20   51200   3days" \
 -o "match:Disk quotas for .*: $" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 #now clear the quotas
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -c ${id}
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -c ${id}
 	done;
 
 #check that we do not get positive reply for any quota type
@@ -85,7 +85,7 @@
 		atf_check -s exit:0 -o "not-match:/mnt" \
 		    -o "not-match:Disk quotas for .*: $" \
 		    -o "match:Disk quotas for .*: none$" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 	rump_shutdown
 }
Index: src/tests/fs/ffs/t_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.2 src/tests/fs/ffs/t_getquota.sh:1.3
--- src/tests/fs/ffs/t_getquota.sh:1.2	Sun Mar  6 17:08:40 2011
+++ src/tests/fs/ffs/t_getquota.sh	Wed Mar  9 19:04:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $ 
+# $NetBSD: t_getquota.sh,v 1.3 2011/03/09 19:04:58 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -66,11 +66,11 @@
 		atf_check -s exit:0 \
 -o "match:/mnt        0        -        -   7days       1       -       -   7days" \
 -o "match:Disk quotas for .*: $" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
 		atf_check -s exit:0 \
 -o "match:--        0        -        -                1       -       -" \
 -o "not-match:\+\+"							  \
-		    $(atf_get_srcdir)/rump_repquota -${q} /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
 	done
 
 #check that we do not get positive reply for non-expected quota
@@ -78,10 +78,10 @@
 		atf_check -s exit:0 -o "not-match:/mnt" \
 		    -o "not-match:Disk quotas for .*: $" \
 		    -o "match:Disk quotas for .*: none$" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
 		atf_check -s exit:0 \
 -o "not-match:--        0        -        -                1       -       -" \
-		    $(atf_get_srcdir)/rump_repquota -${q} /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
 	done
 	rump_shutdown
 }
Index: src/tests/fs/ffs/t_miscquota.sh
diff -u src/tests/fs/ffs/t_miscquota.sh:1.2 src/tests/fs/ffs/t_miscquota.sh:1.3
--- src/tests/fs/ffs/t_miscquota.sh:1.2	Sun Mar  6 17:08:40 2011
+++ src/tests/fs/ffs/t_miscquota.sh	Wed Mar  9 19:04:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_miscquota.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $ 
+# $NetBSD: t_miscquota.sh,v 1.3 2011/03/09 19:04:58 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -77,13 +77,13 @@
 	local i=1;
 	while [ $i -lt 101 ]; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -${expect} \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -${expect} \
 		   -s10k/20 -h40M/50k -t 2W/3D $((i * 4096))
 		i=$((i + 1))
 	done
 	# do a repquota
 	atf_check -s exit:0 -o 'match:<integer>0x64000' \
-	    $(atf_get_srcdir)/rump_repquota -x -${expect} /mnt
+	    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -x -${expect} /mnt
 	rump_shutdown
 }
 
@@ -115,14 +115,14 @@
 	local i=1;
 	while [ $i -lt 11 ]; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -${expect} \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -${expect} \
 		   -s10k/20 -h40M/50k -t 2W/3D $i
 		i=$((i + 1))
 	done
 	# we should have 5 files (root + 4 regular files)
 	atf_check -s exit:0 \
 	    -o 'match:-        -  7days         5       -       -  7days' \
-	    $(atf_get_srcdir)/rump_repquota -av
+	    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -av
 	#shutdown and check filesystem
 	rump_shutdown
 }
Index: src/tests/fs/ffs/t_quotalimit.sh
diff -u src/tests/fs/ffs/t_quotalimit.sh:1.2 src/tests/fs/ffs/t_quotalimit.sh:1.3
--- src/tests/fs/ffs/t_quotalimit.sh:1.2	Sun Mar  6 17:08:40 2011
+++ src/tests/fs/ffs/t_quotalimit.sh	Wed Mar  9 19:04:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_quotalimit.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $ 
+# $NetBSD: t_quotalimit.sh,v 1.3 2011/03/09 19:04:58 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -79,7 +79,7 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2k/4 -h3k/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
 		   -t 2h/2h ${id}
 	done
 	atf_check -s exit:0 rump.halt
@@ -91,10 +91,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   3072 B\*  2048 B   3072 B     2:0      2       4       6         ' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    \+-        3        2        3    2:0         2       4       6' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
@@ -126,7 +126,7 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2k/4 -h3k/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
 		   -t 1s/1d ${id}
 	done
 	atf_check -s exit:0 rump.halt
@@ -138,10 +138,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   2560 B\*  2048 B   3072 B    none      2       4       6         ' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    \+-        2        2        3   none         2       4       6' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
@@ -173,7 +173,7 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2m/4 -h3m/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
 		   -t 2h/2h ${id}
 	done
 	atf_check -s exit:0 rump.halt
@@ -185,10 +185,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   3072 B   2048 K   3072 K              6 \*     4       6      2:0' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    -\+        3     2048     3072                6       4       6    2:0' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
@@ -220,7 +220,7 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2m/4 -h3m/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
 		   -t 1d/1s ${id}
 	done
 	atf_check -s exit:0 rump.halt
@@ -232,10 +232,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   2560 B   2048 K   3072 K              5 \*     4       6     none' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    -\+        2     2048     3072                5       4       6   none' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
@@ -267,13 +267,13 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2k/4 -h3k/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2k/4 -h3k/6 \
 		   -t 2h/2h -d
 	done
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'Disk quotas for .*id 1\): none' \
-		    $(atf_get_srcdir)/rump_quota -$q -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -v ${id}
 	done
 	atf_check -s exit:0 rump.halt
 
@@ -284,10 +284,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   3072 B\*  2048 B   3072 B     2:0      2       4       6         ' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    \+-        3        2        3    2:0         2       4       6' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
@@ -319,13 +319,13 @@
 
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s2m/4 -h3m/6 \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s2m/4 -h3m/6 \
 		   -t 2h/2h -d
 	done
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'Disk quotas for .*id 1\): none' \
-		    $(atf_get_srcdir)/rump_quota -$q -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -v ${id}
 	done
 	atf_check -s exit:0 rump.halt
 
@@ -336,10 +336,10 @@
 	for q in ${expect} ; do
 		atf_check -s exit:0 \
 		    -o match:'/mnt   3072 B   2048 K   3072 K              6 \*     4       6      2:0' \
-		    $(atf_get_srcdir)/rump_quota -$q -h ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -$q -h ${id}
 		atf_check -s exit:0 \
 		    -o match:'daemon    -\+        3     2048     3072                6       4       6    2:0' \
-		    $(atf_get_srcdir)/rump_repquota -$q /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -$q /mnt
 	done
 	rump_shutdown
 }
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.2 src/tests/fs/ffs/t_setquota.sh:1.3
--- src/tests/fs/ffs/t_setquota.sh:1.2	Sun Mar  6 17:08:40 2011
+++ src/tests/fs/ffs/t_setquota.sh	Wed Mar  9 19:04:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.2 2011/03/06 17:08:40 bouyer Exp $ 
+# $NetBSD: t_setquota.sh,v 1.3 2011/03/09 19:04:58 bouyer Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -75,29 +75,29 @@
 	for q in ${expect} ; do
 		local id=$(id -${q})
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
 		   -t 2W/3D ${id}
 		atf_check -s exit:0 \
 -o "match:/mnt        0       10    40960  2weeks       1      20   51200   3days" \
 -o "match:Disk quotas for .*: $" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
 		atf_check -s exit:0 \
 -o "match:--        0       10    40960                1      20   51200" \
-		    $(atf_get_srcdir)/rump_repquota -${q} /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
 	done
 
 #check that we do not get positive reply for non-expected quota
 	for q in ${fail} ; do
 		local id=$(id -${q})
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
 		atf_check -s exit:0 -o "not-match:/mnt" \
 		    -o "not-match:Disk quotas for .*: $" \
 		    -o "match:Disk quotas for .*: none$" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v
 		atf_check -s exit:0 \
 -o "not-match:--        0        -        -" \
-		    $(atf_get_srcdir)/rump_repquota -${q} /mnt
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt repquota -${q} /mnt
 	done
 	rump_shutdown
 }
@@ -131,23 +131,23 @@
 	for q in ${expect} ; do
 		local id=1
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
 		   -t 120W/255D ${id}
 		atf_check -s exit:0 \
 -o "match:/mnt        0       10    40960  2years       0      20   51200 9months" \
 -o "match:Disk quotas for .*: $" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 
 #check that we do not get positive reply for non-expected quota
 	for q in ${fail} ; do
 		local id=$(id -${q})
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
 		atf_check -s exit:0 -o "not-match:/mnt" \
 		    -o "not-match:Disk quotas for .*: $" \
 		    -o "match:Disk quotas for .*: none$" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 	rump_shutdown
 }
@@ -181,23 +181,23 @@
 	for q in ${expect} ; do
 		local id="-d"
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k \
 		   -t 2H2M/3540 ${id}
 		atf_check -s exit:0 \
 -o "match:/mnt        0       10    40960     2:2       0      20   51200      59" \
 -o "match:Default (user|group) disk quotas: $" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 
 #check that we do not get positive reply for non-expected quota
 	for q in ${fail} ; do
 		local id="-d"
 		atf_check -s exit:0 \
-		   $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+		   env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt edquota -$q -s10k/20 -h40M/50k ${id}
 		atf_check -s exit:0 -o "not-match:/mnt" \
 		    -o "not-match:Default (user|group) disk quotas: $" \
 		    -o "match:Default (user|group) disk quotas: none$" \
-		    $(atf_get_srcdir)/rump_quota -${q} -v ${id}
+		    env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=vfs=getvfsstat,blanket=/mnt quota -${q} -v ${id}
 	done
 	rump_shutdown
 }

Reply via email to