Module Name:    src
Committed By:   pgoyette
Date:           Sat Apr 30 17:09:44 UTC 2022

Modified Files:
        src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Don't put temporary files and directories into the atf_srcdir (that
might be read-only!).  Instead, put them in the test's working
directory what the atf framework will automatically clean up after
the test completes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

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

Modified files:

Index: src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh
diff -u src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.1 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.2
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.1	Fri Apr 29 22:17:49 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh	Sat Apr 30 17:09:44 2022
@@ -6,27 +6,27 @@ nullmnt_head()
 
 nullmnt_body()
 {    
-	srcdir=$(atf_get_srcdir)
-	helper=${srcdir}/h_nullmnt
+	curdir=$(pwd)
+	helper=$(atf_get_srcdir)/h_nullmnt
 
-	mkdir ${srcdir}/realdir
-	mkdir ${srcdir}/nulldir
-	mount -t null ${srcdir}/realdir ${srcdir}/nulldir
-	rm -f ${srcdir}/realdir/afile
-	touch ${srcdir}/realdir/afile
+	mkdir ${curdir}/realdir
+	mkdir ${curdir}/nulldir
+	mount -t null ${curdir}/realdir ${curdir}/nulldir
+	rm -f ${curdir}/realdir/afile
+	touch ${curdir}/realdir/afile
 
 	atf_expect_fail "PR kern/56713"
 
 	atf_check -e ignore -o ignore -s exit:0 \
-		${helper} ${srcdir}/realdir/afile ${srcdir}/nulldir/afile
+		${helper} ${curdir}/realdir/afile ${curdir}/nulldir/afile
 
 } 
 
 nullmnt_cleanup()
 {
-	srcdir=$(atf_get_srcdir)
-	umount ${srcdir}/nulldir
-	rm -rf ${srcdir}/realdir ${srcdir}/nulldir
+	curdir=$(pwd)
+	umount ${curdir}/nulldir
+	rm -rf ${curdir}/realdir ${curdir}/nulldir
 }
 
 atf_init_test_cases()

Reply via email to