From 32bda2723d57ff0ef33b166403253679f3fe0cb2 Mon Sep 17 00:00:00 2001
From: Anton Lindqvist <anton@cvs.openbsd.org>
Date: Fri, 13 Oct 2023 19:30:19 +0000
Subject: Use a unique mount point rooted in /mnt in order to not conflict with
 other tests.

---
 regress/sys/mfs_noperm/Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'regress')

diff --git a/regress/sys/mfs_noperm/Makefile b/regress/sys/mfs_noperm/Makefile
index 35f634a48eb..537c010ec93 100644
--- a/regress/sys/mfs_noperm/Makefile
+++ b/regress/sys/mfs_noperm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2018/12/23 11:23:21 natano Exp $
+#	$OpenBSD: Makefile,v 1.2 2023/10/13 19:30:18 anton Exp $
 
 PROG=   nopermtest
 CDIAGFLAGS=	-Wall
@@ -15,20 +15,24 @@ REGRESS_SETUP_ONCE=	mount
 REGRESS_CLEANUP=	umount
 REGRESS_TARGETS=	run-regress-locked run-regress-unlocked
 
+MNT=	/mnt/regress-mfs_noperm
+
 mount:
-	mount_mfs -s1M -o noperm swap /mnt
+	mkdir -p ${MNT}
+	mount_mfs -s1M -o noperm swap ${MNT}
 
 umount:
-	umount -f /mnt
+	umount -f ${MNT} || true
+	rmdir ${MNT} || true
 
 run-regress-locked: ${PROG}
-	chown root:wheel /mnt
-	chmod 700 /mnt
-	su build -c './${PROG} /mnt locked'
+	chown root:wheel ${MNT}
+	chmod 700 ${MNT}
+	su build -c './${PROG} ${MNT} locked'
 
 run-regress-unlocked: ${PROG}
-	chown build /mnt
-	chmod 700 /mnt
-	su build -c './${PROG} /mnt unlocked'
+	chown build ${MNT}
+	chmod 700 ${MNT}
+	su build -c './${PROG} ${MNT} unlocked'
 
 .include <bsd.regress.mk>
-- 
cgit v1.2.3