Module Name: src
Committed By: pgoyette
Date: Mon May 30 03:33:07 UTC 2022
Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh
Log Message:
Update test so all four combinations of update_{upper, lower} x
monitor_{upper, lower}} can be verified. Currently update_upper
is expected to fail regardless of which file is being monitored.
PR kern/56713
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.3
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.2 Sat Apr 30 17:09:44 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh Mon May 30 03:33:07 2022
@@ -1,35 +1,90 @@
-atf_test_case nullmnt cleanup
-nullmnt_head()
-{
- atf_set "descr" "ensure file events traverse null-mounts"
-}
+# common test body
+# $1 = pathname of file to monitor
+# $2 = pathname of file to update/modify
-nullmnt_body()
+nullmnt_common()
{
curdir=$(pwd)
helper=$(atf_get_srcdir)/h_nullmnt
- mkdir ${curdir}/realdir
- mkdir ${curdir}/nulldir
- mount -t null ${curdir}/realdir ${curdir}/nulldir
- rm -f ${curdir}/realdir/afile
- touch ${curdir}/realdir/afile
+ mkdir ${curdir}/lower_dir
+ mkdir ${curdir}/upper_dir
+ mount -t null ${curdir}/lower_dir ${curdir}/upper_dir
+ rm -f ${curdir}/lower_dir/afile
+ touch ${curdir}/lower_dir/afile
- atf_expect_fail "PR kern/56713"
+ atf_check -e ignore -o ignore -s exit:0 \
+ ${helper} ${curdir}/${1} ${curdir}/${2}
+}
- atf_check -e ignore -o ignore -s exit:0 \
- ${helper} ${curdir}/realdir/afile ${curdir}/nulldir/afile
+nullmnt_common_cleanup()
+{
+ curdir=$(pwd)
+ umount ${curdir}/upper_dir
+ rm -rf ${curdir}/lower_dir ${curdir}/upper_dir
+}
+atf_test_case nullmnt_upper_lower cleanup
+nullmnt_upper_lower_head()
+{
+ atf_set "descr" "ensure upper fs events seen on lower fs"
+}
+nullmnt_upper_lower_body()
+{
+ atf_expect_fail "PR kern/56713"
+ nullmnt_common lower_dir/afile upper_dir/afile
}
+nullmnt_upper_lower_cleanup()
+{
+ nullmnt_common_cleanup
+}
-nullmnt_cleanup()
+atf_test_case nullmnt_upper_upper cleanup
+nullmnt_upper_upper_head()
{
- curdir=$(pwd)
- umount ${curdir}/nulldir
- rm -rf ${curdir}/realdir ${curdir}/nulldir
+ atf_set "descr" "ensure upper fs events seen on upper fs"
+}
+nullmnt_upper_upper_body()
+{
+ atf_expect_fail "PR kern/56713"
+ nullmnt_common upper_dir/afile upper_dir/afile
+}
+nullmnt_upper_upper_cleanup()
+{
+ nullmnt_common_cleanup
+}
+atf_test_case nullmnt_lower_upper cleanup
+nullmnt_lower_upper_head()
+{
+ atf_set "descr" "ensure lower fs events seen on upper fs"
+}
+nullmnt_lower_upper_body()
+{
+ nullmnt_common upper_dir/afile lower_dir/afile
+}
+nullmnt_lower_upper_cleanup()
+{
+ nullmnt_common_cleanup
+}
+
+atf_test_case nullmnt_lower_lower cleanup
+nullmnt_lower_lower_head()
+{
+ atf_set "descr" "ensure lower fs events seen on lower fs"
+}
+nullmnt_lower_lower_body()
+{
+ nullmnt_common lower_dir/afile lower_dir/afile
+}
+nullmnt_lower_lower_cleanup
+{
+ nullmnt_common_cleanup()
}
atf_init_test_cases()
{
- atf_add_test_case nullmnt
+ atf_add_test_case nullmnt_upper_upper
+ atf_add_test_case nullmnt_upper_lower
+ atf_add_test_case nullmnt_lower_upper
+ atf_add_test_case nullmnt_lower_lower
}
