summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2024-11-06 18:42:55 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2024-11-06 18:42:55 +0000
commit17ce0dfae2c6bfb417e0b33f744a5da6f046a584 (patch)
tree8ffdbce29062f377293023634a37a4b4e06bf7c8
parent3a86a26d54a2e0e4b34ba0edefea23cd5c46edf9 (diff)
Remove vnd(4) diskimage after testing to avoid that running regress
fills up /usr/obj too quickly.
-rw-r--r--regress/sys/fileops/Makefile.inc7
-rw-r--r--regress/sys/kern/mount/Makefile7
2 files changed, 12 insertions, 2 deletions
diff --git a/regress/sys/fileops/Makefile.inc b/regress/sys/fileops/Makefile.inc
index 9f80b401b5f..f2ec70c2d24 100644
--- a/regress/sys/fileops/Makefile.inc
+++ b/regress/sys/fileops/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.6 2023/10/13 19:28:59 anton Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2024/11/06 18:42:54 bluhm Exp $
PERL_REQUIRE != perl -e 'eval { require File::Slurp } or print $$@'
@@ -36,6 +36,11 @@ unconfig:
-vnconfig -u $$(<vnd) 2>/dev/null || true
rm -f stamp-setup
+# disk image takes up too much space in /usr/obj
+REGRESS_CLEANUP+= remove-diskimage
+remove-diskimage:
+ rm -f diskimage
+
${.OBJDIR}/../fileops:
${.MAKE} -C ${.CURDIR}/.. fileops
diff --git a/regress/sys/kern/mount/Makefile b/regress/sys/kern/mount/Makefile
index 77cd1b49485..597a56dcd3f 100644
--- a/regress/sys/kern/mount/Makefile
+++ b/regress/sys/kern/mount/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2023/10/12 16:59:24 anton Exp $
+# $OpenBSD: Makefile,v 1.11 2024/11/06 18:42:54 bluhm Exp $
# This regress test uses a vnd device to run mount and unmount.
# All tests have to be run as root.
@@ -37,6 +37,11 @@ unconfig:
-rmdir /mnt/regress-mount 2>/dev/null || true
-vnconfig -u $$(<vnd) 2>/dev/null || true
+# disk image takes up too much space in /usr/obj
+REGRESS_CLEANUP += remove-diskimage
+remove-diskimage:
+ rm -f diskimage
+
# The unmount-nested test uses a disk template to create 15 partitions
# on a vnd device. All are initialized with a ffs file system.
# Then they are mounted nestedly in /mnt, see disktemplate for the