Module Name:    src
Committed By:   christos
Date:           Fri Oct 18 23:22:52 UTC 2024

Modified Files:
        src/tests/usr.sbin: Makefile
Added Files:
        src/tests/usr.sbin/makefs: Makefile t_makefs.sh

Log Message:
Add a makefs test


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.sbin/makefs/Makefile \
    src/tests/usr.sbin/makefs/t_makefs.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/usr.sbin/Makefile
diff -u src/tests/usr.sbin/Makefile:1.8 src/tests/usr.sbin/Makefile:1.9
--- src/tests/usr.sbin/Makefile:1.8	Sat Aug 26 01:27:14 2023
+++ src/tests/usr.sbin/Makefile	Fri Oct 18 19:22:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/08/26 05:27:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2024/10/18 23:22:52 christos Exp $
 .include <bsd.own.mk>
 
 TESTSDIR=       ${TESTSBASE}/usr.sbin
@@ -7,6 +7,7 @@ TESTS_SUBDIRS+= certctl
 TESTS_SUBDIRS+= cpuctl
 TESTS_SUBDIRS+= execsnoop
 TESTS_SUBDIRS+= inetd
+TESTS_SUBDIRS+= makefs
 TESTS_SUBDIRS+= mtree
 TESTS_SUBDIRS+= opensnoop
 TESTS_SUBDIRS+= stdethers

Added files:

Index: src/tests/usr.sbin/makefs/Makefile
diff -u /dev/null src/tests/usr.sbin/makefs/Makefile:1.1
--- /dev/null	Fri Oct 18 19:22:52 2024
+++ src/tests/usr.sbin/makefs/Makefile	Fri Oct 18 19:22:52 2024
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2024/10/18 23:22:52 christos Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/makefs
+TESTS_SH=	t_makefs
+
+.include <bsd.test.mk>
Index: src/tests/usr.sbin/makefs/t_makefs.sh
diff -u /dev/null src/tests/usr.sbin/makefs/t_makefs.sh:1.1
--- /dev/null	Fri Oct 18 19:22:52 2024
+++ src/tests/usr.sbin/makefs/t_makefs.sh	Fri Oct 18 19:22:52 2024
@@ -0,0 +1,65 @@
+# $NetBSD: t_makefs.sh,v 1.1 2024/10/18 23:22:52 christos Exp $
+#
+# Copyright (c) 2024 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Christos Zoulas
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+# replace
+#
+atf_test_case replace replace_cleanup
+
+replace_head() {
+	atf_require_prog makefs
+	atf_set "descr" "Test replacing a single file (PR/58759)"
+}
+
+replace_body() {
+	export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+	mkdir -p 1 2/1
+	echo foo > 1/foo
+	echo bar > 2/1/foo
+	makefs -r -d 0xf0 -s 1m -t ffs foo.img 1 2/1
+	dump 0f foo.dump -F foo.img
+	restore -rf foo.dump
+	if [ ! -f foo ]; then
+		atf_fail "file foo does not exist"
+	fi
+	x=$(cat foo)
+	if [ "$x" != "bar" ]; then
+		atf_fail "file foo does not contain bar, but $x"
+	fi
+	atf_pass
+}
+
+replace_cleanup() {
+	rm -fr 1 2 foo foo.dump foo.img
+}
+
+atf_init_test_cases() {
+	atf_add_test_case replace
+}

Reply via email to