diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 3171988e1035..e902a33ca417 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1,1142 +1,1144 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 tags=package=tests . bin cat .. chflags .. chmod .. cp .. date .. dd .. echo .. expr .. ln .. ls .. mkdir .. mv .. pax .. pkill .. pwait .. rm .. rmdir .. sh builtins .. errors .. execution .. expansion .. invocation .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin ctfconvert .. ztest .. .. usr.sbin dtrace common aggs .. arithmetic .. arrays .. assocs .. begin .. bitfields .. buffering .. builtinvar .. cg .. clauses .. cpc .. decls .. drops .. dtraceUtil .. end .. env .. enum .. error .. exit .. fbtprovider .. funcs .. grammar .. include .. inline .. io .. ip .. java_api .. json .. lexer .. llquantize .. mdb .. mib .. misc .. multiaggs .. offsetof .. operators .. pid .. plockstat .. pointers .. pragma .. predicates .. preprocessor .. print .. printa .. printf .. privs .. probes .. proc .. profile-n .. providers .. raise .. rates .. safety .. scalars .. sched .. scripting .. sdt .. sizeof .. speculation .. stability .. stack .. stackdepth .. stop .. strlen .. strtoll .. struct .. sugar .. syscall .. sysevent .. tick-n .. trace .. tracemem .. translators .. typedef .. types .. uctf .. union .. usdt .. ustack .. vars .. version .. .. i386 arrays .. funcs .. pid .. ustack .. .. amd64 arrays .. .. .. zfsd .. .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. csu dynamic .. dynamiclib .. static .. .. googletest gmock .. gmock_main .. gtest .. gtest_main .. .. libarchive .. libbe .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. iconv .. inet .. locale .. net getaddrinfo data .. .. .. nss .. regex data .. .. resolv .. rpc .. ssp .. setjmp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. libcam .. libcasper services cap_dns .. cap_grp .. cap_pwd .. cap_sysctl .. .. .. libcrypt .. libdevdctl .. libexecinfo .. libkvm .. libmp .. libnv .. libproc .. libregex data .. .. librt .. libsbuf .. libsysdecode .. libthr dlopen .. .. libutil .. libxo .. msun .. .. libexec atf atf-check .. atf-sh .. .. rtld-elf .. tftpd .. .. sbin bectl .. dhclient .. devd .. growfs .. ifconfig .. md5 .. mdconfig .. newfs_msdos .. nvmecontrol .. pfctl files .. .. ping .. route .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. googletest .. plain .. tap .. .. .. zoneinfo .. .. sys acl .. aio .. audit .. auditpipe .. capsicum .. cddl zfs bin .. include .. tests acl cifs .. nontrivial .. trivial .. .. atime .. bootfs .. cache .. cachefile .. clean_mirror .. cli_root zfs_upgrade .. zfs_promote .. zfs_clone .. zfs_property .. zfs_destroy .. zpool_create .. zpool_history .. zpool_expand .. zpool_remove .. zfs_mount .. zfs_unshare .. zdb .. zpool_online .. zpool_get .. zpool_export .. zfs_copies .. zfs_get .. zfs .. zpool_clear .. zpool_import blockfiles .. .. zpool .. zpool_offline .. zpool_replace .. zfs_rollback .. zpool_set .. zfs_send .. zfs_set .. zpool_detach .. zfs_diff .. zpool_scrub .. zfs_inherit .. zfs_snapshot .. zfs_share .. zpool_destroy .. zpool_status .. zfs_unmount .. zfs_receive .. zfs_create .. zpool_upgrade blockfiles .. .. zpool_add .. zfs_rename .. zpool_attach .. zfs_reservation .. .. cli_user misc .. zfs_list .. zpool_iostat .. zpool_list .. .. compression .. ctime .. delegate .. devices .. exec .. grow_pool .. grow_replicas .. history .. hotplug .. hotspare .. inheritance .. interop .. inuse .. iscsi .. large_files .. largest_pool .. link_count .. migration .. mmap .. mount .. mv_files .. nestedfs .. no_space .. online_offline .. pool_names .. poolversion .. quota .. redundancy .. refquota .. refreserv .. rename_dirs .. replacement .. reservation .. rootpool .. rsend .. scrub_mirror .. slog .. snapshot .. snapused .. sparse .. threadsappend .. truncate .. txg_integrity .. userquota .. utils_test .. write_dirs .. xattr .. zfsd .. zil .. zinject .. zones .. zvol zvol_ENOSPC .. zvol_cli .. zvol_misc .. zvol_swap .. .. zvol_thrash .. .. .. .. devrandom .. dtrace .. fifo .. file .. fs fusefs .. tmpfs .. .. geom class concat .. eli .. gate .. gpt .. mirror .. multipath .. nop .. part .. raid3 .. shsec .. stripe .. uzip etalon .. .. .. .. kern acct .. execve .. pipe .. .. kqueue libkqueue .. .. mac bsdextended .. portacl .. .. mqueue .. net .. netgraph .. netinet .. netinet6 frag6 .. .. netipsec tunnel .. .. netmap .. netpfil common .. pf ioctl .. .. .. opencrypto .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. utimensat .. .. posixshm .. sys .. vfs .. vm .. vmm .. .. usr.bin apply .. awk .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. bsdcat .. calendar .. cmp .. compress .. cpio .. col .. comm .. csplit .. cut .. dc .. diff .. diff3 .. dirname .. du .. file2c .. file .. find .. fold .. getconf .. gh-bc .. grep .. gzip .. head .. hexdump .. ident .. indent .. join .. jot .. lastcomm .. limits .. locale .. m4 .. mkimg .. ncal .. opensm .. patch .. pr .. printf .. procstat .. renice .. rs .. sdiff .. sed regress.multitest.out .. .. seq .. soelim .. sort .. + split + .. stat .. tail .. tar .. timeout .. tr .. truncate .. units .. uudecode .. uuencode .. unifdef .. uniq .. vmstat .. xargs .. xinstall .. xo .. yacc yacc .. .. .. usr.sbin chown .. daemon .. etcupdate .. extattr .. fstyp .. jail .. makefs .. mixer .. newsyslog .. nmtree .. praudit .. pw .. rpcbind .. sa .. .. .. # vim: set expandtab ts=4 sw=4: diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile index 6891f8bbb4d7..c366d574e090 100644 --- a/usr.bin/split/Makefile +++ b/usr.bin/split/Makefile @@ -1,8 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= split LIBADD= util +HAS_TESTS= yes +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/split/tests/Makefile b/usr.bin/split/tests/Makefile new file mode 100644 index 000000000000..29ef04f8fa3b --- /dev/null +++ b/usr.bin/split/tests/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +PACKAGE= tests + +ATF_TESTS_SH+= split_test + +.include diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh new file mode 100755 index 000000000000..58f62c3d018f --- /dev/null +++ b/usr.bin/split/tests/split_test.sh @@ -0,0 +1,213 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2022 Klara Systems +# +# 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 AUTHOR 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 AUTHOR 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. +# +# $FreeBSD$ + +# sys/param.h +: ${MAXBSIZE:=65536} + +atf_test_case bytes +bytes_body() +{ + printf "aaaa" > foo-aa + printf "bb\nc" > foo-ab + printf "ccc\n" > foo-ac + + cat foo-* > foo + atf_check split -b 4 foo split- + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac + + # MAXBSIZE is the default buffer size, so we'll split at just a little + # bit past the buffer size to make sure that it still properly splits + # even when it needs to read again to hit the limit. + bsize=$((MAXBSIZE + 12)) + rm foo-* foo + jot -ns "" -b "a" ${bsize} > foo-aa + jot -ns "" -b "b" ${bsize} > foo-ab + jot -ns "" -b "c" 12 > foo-ac + + cat foo-* > foo + atf_check split -b ${bsize} foo split- + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac +} + +atf_test_case chunks +chunks_body() +{ + jot -ns "" -b "a" 4096 > foo + jot -ns "" -b "b" 4096 >> foo + jot -ns "" -b "c" 4104 >> foo + + chunks=3 + jot -ns "" -b "a" 4096 > foo-aa + jot -ns "" -b "b" 2 >> foo-aa + jot -ns "" -b "b" 4094 > foo-ab + jot -ns "" -b "c" 4 >> foo-ab + jot -ns "" -b "c" 4100 > foo-ac + + atf_check split -n ${chunks} foo split- + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac +} + +atf_test_case sensible_lines +sensible_lines_body() +{ + echo "The quick brown fox" > foo-aa + echo "jumps over" > foo-ab + echo "the lazy dog" > foo-ac + + cat foo-* > foo + atf_check split -l 1 foo split- + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac + + # Try again, make sure that `-` uses stdin as documented. + atf_check rm split-* + atf_check -x 'split -l 1 - split- < foo' + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac + + # Finally, try with -l == 2; we should see a 2/1 split instead of the + # previous 1/1/1. + cat foo-aa foo-ab > foo-aa-ng + cat foo-ac > foo-ab-ng + + atf_check rm split-* + atf_check split -l 2 foo split- + + atf_check -o file:foo-aa-ng cat split-aa + atf_check -o file:foo-ab-ng cat split-ab +} + +atf_test_case long_lines +long_lines_body() +{ + + # Test file lines will be: + # a x MAXBSIZE + # b x MAXBSIZE + c x MAXBSIZE + # d x 1024 + # + # The historical split(1) implementation wouldn't grow its internal + # buffer, so we'd end up with 2/3 split- files being wrong with -l 1. + # Notably, split-aa would include most of the first two lines, split-ab + # a tiny fraction of the second line, and split-ac the third line. + # + # Recent split(1) instead grows the buffer until we can either fit the + # line or we run out of memory. + jot -s "" -b "a" ${MAXBSIZE} > foo-aa + jot -ns "" -b "b" ${MAXBSIZE} > foo-ab + jot -s "" -b "c" ${MAXBSIZE} >> foo-ab + jot -s "" -b "d" 1024 > foo-ac + + cat foo-* > foo + atf_check split -l 1 foo split- + + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab + atf_check -o file:foo-ac cat split-ac +} + +atf_test_case numeric_suffix +numeric_suffix_body() +{ + echo "The quick brown fox" > foo-00 + echo "jumps over" > foo-01 + echo "the lazy dog" > foo-02 + + cat foo-* > foo + atf_check split -d -l 1 foo split- + + atf_check -o file:foo-00 cat split-00 + atf_check -o file:foo-01 cat split-01 + atf_check -o file:foo-02 cat split-02 +} + +atf_test_case larger_suffix_length +larger_suffix_length_body() +{ + :> foo + + # Generate foo-000 through foo-009, then foo-010 and foo-011 + for i in $(seq -w 0 11); do + len=$((${i##0} + 1)) + file="foo-0${i}" + jot -s "" -b "a" ${len} > ${file} + cat ${file} >> foo + done + + atf_check split -a 3 -d -l 1 foo split- + for i in $(seq -w 0 11); do + srcfile="foo-0${i}" + splitfile="split-0${i}" + atf_check -o file:"${srcfile}" cat "${splitfile}" + done +} + +atf_test_case pattern +pattern_body() +{ + + # Some fake yaml gives us a good realistic use-case for -p, as we can + # split on top-level stanzas. + cat < foo-aa +cat: + aa: true + ab: true + ac: true +EOF + cat < foo-ab +dog: + ba: true + bb: true + bc: true +EOF + + cat foo-* > foo + + atf_check split -p "^[^[:space:]]+:" foo split- + atf_check -o file:foo-aa cat split-aa + atf_check -o file:foo-ab cat split-ab +} + +atf_init_test_cases() +{ + atf_add_test_case bytes + atf_add_test_case chunks + atf_add_test_case sensible_lines + atf_add_test_case long_lines + atf_add_test_case numeric_suffix + atf_add_test_case larger_suffix_length + atf_add_test_case pattern +}