diff options
| author | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2020-03-11 16:42:06 -0400 |
| commit | 2803e163cd303fbc63f832f544bc59c4ee562252 (patch) | |
| tree | c901ef8fa7580dcebfb11316f6bb49d498bd40a8 /usr/src/test | |
| parent | dd05dd221f0e26bb86692b7b69c8dbeab8f4c0e5 (diff) | |
| parent | 1de02da27664d38cedeccf227bd4ae92d32619d9 (diff) | |
| download | illumos-joyent-bhyve-sync.tar.gz | |
Merge remote-tracking branch 'origin/master' into bhyve-syncbhyve-sync
Diffstat (limited to 'usr/src/test')
86 files changed, 1369 insertions, 4 deletions
diff --git a/usr/src/test/util-tests/runfiles/default.run b/usr/src/test/util-tests/runfiles/default.run index 307518139d..a2d463761c 100644 --- a/usr/src/test/util-tests/runfiles/default.run +++ b/usr/src/test/util-tests/runfiles/default.run @@ -13,7 +13,7 @@ # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2014 Nexenta Systems, Inc. All rights reserved. -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # @@ -78,3 +78,7 @@ tests = [ 'ctftest' ] [/opt/util-tests/tests/libcustr] tests = ['custr_remove', 'custr_trunc'] + +[/opt/util-tests/tests/find/findtest] + +[/opt/util-tests/tests/mdb/mdbtest] diff --git a/usr/src/test/util-tests/tests/Makefile b/usr/src/test/util-tests/tests/Makefile index 67efd10530..3362ac2941 100644 --- a/usr/src/test/util-tests/tests/Makefile +++ b/usr/src/test/util-tests/tests/Makefile @@ -20,6 +20,6 @@ SUBDIRS = date dis dladm iconv libnvpair_json libsff printf xargs grep_xpg4 SUBDIRS += demangle mergeq workq chown ctf smbios libjedec awk make sleep -SUBDIRS += bunyan libcustr +SUBDIRS += bunyan libcustr find mdb include $(SRC)/test/Makefile.com diff --git a/usr/src/test/util-tests/tests/find/Makefile b/usr/src/test/util-tests/tests/find/Makefile new file mode 100644 index 0000000000..66e2bab009 --- /dev/null +++ b/usr/src/test/util-tests/tests/find/Makefile @@ -0,0 +1,41 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/test/Makefile.com + +ROOTOPTPKG = $(ROOT)/opt/util-tests/tests/find +PROG = findtest + +ROOTPROG = $(PROG:%=$(ROOTOPTPKG)/%) + +all: + +install: $(ROOTPROG) + +clobber: clean + +clean: + +$(CMDS): $(TESTDIR) + +$(ROOTOPTPKG): + $(INS.dir) + +$(ROOTOPTPKG)/%: %.ksh $(ROOTOPTPKG) + $(INS.rename) + +$(ROOTOPTPKG)/%: % $(ROOTOPTPKG) + $(INS.file) diff --git a/usr/src/test/util-tests/tests/find/findtest.ksh b/usr/src/test/util-tests/tests/find/findtest.ksh new file mode 100644 index 0000000000..9e321fb664 --- /dev/null +++ b/usr/src/test/util-tests/tests/find/findtest.ksh @@ -0,0 +1,72 @@ +#!/bin/ksh +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +# +# Clearly, grossly incomplete. +# + +export LC_ALL=C.UTF-8 + +set -o pipefail +unalias -a + +find_prog=/usr/bin/find +find_prog_xpg4=/usr/xpg4/bin/find +find_dir="$(mktemp -d -p /tmp/)" +find_exit=0 + +testfind() +{ + exp=$1 + shift + cmd="$@" + + echo "TEST: $cmd" + + out=$(eval $cmd | tr '\n' ',') + + [[ "$exp" = "$out" ]] || { + echo "TEST FAILED: $cmd" >&2 + echo "expected: $exp" >&2 + echo "got: $out" >&2 + find_exit=1 + } +} + +mkdir -p $find_dir/1 +mkdir -p $find_dir/.2 +touch $find_dir/.2/1 +touch $find_dir/.2/c + +testfind "$find_dir/1,$find_dir/.2/1," \ + $find_prog $find_dir -name \"1\" +testfind "$find_dir/1,$find_dir/.2/1," \ + $find_prog $find_dir -path \"*1\" + +cd $find_dir + +testfind "" $find_prog . -name \"*2\" +testfind "./.2," $find_prog_xpg4 . -name \"*2\" +testfind "./.2," $find_prog . -name \".*2\" +testfind "./.2," $find_prog_xpg4 . -name \".*2\" +testfind "./1,./.2/1," $find_prog . -path \"*1\" +testfind "./.2," $find_prog . -path \"*2\" +testfind "./.2,./.2/1,./.2/c," $find_prog . -path \"*2*\" + +cd - +rm -rf $find_dir + +exit $find_exit diff --git a/usr/src/test/util-tests/tests/mdb/Makefile b/usr/src/test/util-tests/tests/mdb/Makefile new file mode 100644 index 0000000000..d7d205bc82 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/Makefile @@ -0,0 +1,127 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/test/Makefile.com + +ROOTOPTPKG = $(ROOT)/opt/util-tests +TESTDIR = $(ROOTOPTPKG)/tests/mdb + +PROG = mdbtest + +ROOTPROG = $(PROG:%=$(TESTDIR)/%) + +MAKEDIRS = \ + exit-e \ + format \ + options \ + typedef + +FILES = \ + exit-e/err.cmdbadopt.ksh \ + exit-e/err.enocmd.ksh \ + exit-e/err.nowrite.ksh \ + exit-e/err.unmapped.ksh \ + exit-e/tst.output.ksh \ + exit-e/tst.output.ksh.out \ + exit-e/tst.simple.ksh \ + format/tst.format-cap-E.mdb \ + format/tst.format-cap-E.mdb.out \ + format/tst.format-cap-G.mdb \ + format/tst.format-cap-G.mdb.out \ + format/tst.format-cap-J.mdb \ + format/tst.format-cap-J.mdb.out \ + format/tst.format-cap-P.mdb \ + format/tst.format-cap-P.mdb.out \ + format/tst.format-cap-R.mdb \ + format/tst.format-cap-R.mdb.out \ + format/tst.format-e.mdb \ + format/tst.format-e.mdb.out \ + format/tst.format-g.mdb \ + format/tst.format-g.mdb.out \ + format/tst.format-j.mdb \ + format/tst.format-j.mdb.out \ + format/tst.format-p.mdb \ + format/tst.format-p.mdb.out \ + options/tst.autowrap.mdb \ + options/tst.autowrap.mdb.out \ + typedef/err.badid-leadnum.ksh \ + typedef/err.badid-leadschar.ksh \ + typedef/err.badmodel.ksh \ + typedef/err.badstruct-extrabraces.ksh \ + typedef/err.badstruct-neglenarr.ksh \ + typedef/err.badstruct-noarrayclose.ksh \ + typedef/err.badstruct-noarraylen.ksh \ + typedef/err.badstruct-noarrayopen.ksh \ + typedef/err.badstruct-nobraces.ksh \ + typedef/err.badstruct-noclosebrace.ksh \ + typedef/err.badstruct-nomembers.ksh \ + typedef/err.badstruct-nomemname.ksh \ + typedef/err.badstruct-nomemsemi.ksh \ + typedef/err.badstruct-noopenbrace.ksh \ + typedef/err.badstruct-noquotes.ksh \ + typedef/err.badstruct-repmemname.ksh \ + typedef/err.badstruct-vlaonly.ksh \ + typedef/err.badstruct-zerolenarr.ksh \ + typedef/err.badunion-hasvla.ksh \ + typedef/err.extraargs.ksh \ + typedef/err.noargs.ksh \ + typedef/err.nokeyword.ksh \ + typedef/err.nomodel.ksh \ + typedef/err.noname.ksh \ + typedef/err.typeexists.ksh \ + typedef/tst.anonstruct.mdb \ + typedef/tst.anonstruct.mdb.out \ + typedef/tst.anonunion.mdb \ + typedef/tst.anonunion.mdb.out \ + typedef/tst.cleanupstruct.ksh \ + typedef/tst.deftypes32.mdb \ + typedef/tst.deftypes32.mdb.out \ + typedef/tst.deftypes64.mdb \ + typedef/tst.deftypes64.mdb.out \ + typedef/tst.dellist.mdb \ + typedef/tst.emptylist.mdb \ + typedef/tst.libctype.ksh \ + typedef/tst.libctype.ksh.out \ + typedef/tst.models.ksh \ + typedef/tst.struct.mdb \ + typedef/tst.struct.mdb.out \ + typedef/tst.structselfref.mdb \ + typedef/tst.structselfref.mdb.out \ + typedef/tst.structvla.mdb \ + typedef/tst.structvla.mdb.out \ + typedef/tst.union.mdb \ + typedef/tst.union.mdb.out \ + +ROOTFILES = $(FILES:%=$(TESTDIR)/%) +ROOTMAKEDIRS = $(MAKEDIRS:%=$(TESTDIR)/%) + +FILEMODE = 0444 + +$(TESTDIR)/mdbtest := FILEMODE = 0555 + +all: + +install: all $(ROOTFILES) $(ROOTPROG) + +clean clobber: + +$(ROOTFILES): $(TESTDIR) $(ROOTMAKEDIRS) $(FILES) + +$(TESTDIR) $(ROOTMAKEDIRS): + $(INS.dir) + +$(TESTDIR)/%: % + $(INS.file) diff --git a/usr/src/test/util-tests/tests/mdb/README b/usr/src/test/util-tests/tests/mdb/README new file mode 100644 index 0000000000..28127e5916 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/README @@ -0,0 +1,18 @@ +MDB Test suite + +This provides a primordial version of a test suite for mdb. To run the tests, +run mtest. Tests exist in various subdirectories. The name of the test is +important. + +A test must start with either: + + o tst - Indicating that it should exit zero + o err - Indicating that it should exit non-zero + +A test must end with either: + + o mdb - Indicating that the file should be passed as standard input to mdb + o ksh - Indicating that it should be run with ksh + +A test may have an optional .out file which if present indicates that the test +should pass if and only if its standard ouput matches its standar error. diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh new file mode 100644 index 0000000000..de50faeb01 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh @@ -0,0 +1,2 @@ +$MDB -e '::typegraph' +exit $? diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/err.enocmd.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.enocmd.ksh new file mode 100644 index 0000000000..038f121b26 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.enocmd.ksh @@ -0,0 +1,2 @@ +$MDB -e '::commandthatdoesnotexist' +exit $? diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/err.nowrite.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.nowrite.ksh new file mode 100644 index 0000000000..8f0fda2253 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.nowrite.ksh @@ -0,0 +1 @@ +$MDB -e '0xbaddcafe/v 0x02' diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/err.unmapped.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.unmapped.ksh new file mode 100644 index 0000000000..874283f186 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.unmapped.ksh @@ -0,0 +1 @@ +$MDB -e '0x0/v 0x02' /bin/ls diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh new file mode 100644 index 0000000000..13b5db072d --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh @@ -0,0 +1 @@ +$MDB -e '0t2 << 0t10=K' diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh.out b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh.out new file mode 100644 index 0000000000..7a38ab6e65 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh.out @@ -0,0 +1 @@ + 800 diff --git a/usr/src/test/util-tests/tests/mdb/exit-e/tst.simple.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/tst.simple.ksh new file mode 100644 index 0000000000..4c8a3c58ad --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.simple.ksh @@ -0,0 +1 @@ +$MDB -e '::dcmds' diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb new file mode 100644 index 0000000000..18e9053ce4 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb @@ -0,0 +1,2 @@ +-1,10=E +1<<0t63,10=E diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out new file mode 100644 index 0000000000..2268a48be9 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out @@ -0,0 +1,12 @@ + 18446744073709551615 18446744073709551615 18446744073709551615 + 18446744073709551615 18446744073709551615 18446744073709551615 + 18446744073709551615 18446744073709551615 18446744073709551615 + 18446744073709551615 18446744073709551615 18446744073709551615 + 18446744073709551615 18446744073709551615 18446744073709551615 + 18446744073709551615 + 9223372036854775808 9223372036854775808 9223372036854775808 + 9223372036854775808 9223372036854775808 9223372036854775808 + 9223372036854775808 9223372036854775808 9223372036854775808 + 9223372036854775808 9223372036854775808 9223372036854775808 + 9223372036854775808 9223372036854775808 9223372036854775808 + 9223372036854775808 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb new file mode 100644 index 0000000000..f10f78336b --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb @@ -0,0 +1,4 @@ +-1,10=G +1<<0t63,10=G +1<<0t60,10=G +1<<0t57,10=G diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out new file mode 100644 index 0000000000..f1dfd5193b --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out @@ -0,0 +1,32 @@ + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1777777777777777777777 1777777777777777777777 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 1000000000000000000000 1000000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb new file mode 100644 index 0000000000..ff9dabbce9 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb @@ -0,0 +1,3 @@ +-1,10=J +1<<0t63,10=J +1<<0t59,10=J diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out new file mode 100644 index 0000000000..644fee231e --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out @@ -0,0 +1,16 @@ + ffffffffffffffff ffffffffffffffff ffffffffffffffff + ffffffffffffffff ffffffffffffffff ffffffffffffffff + ffffffffffffffff ffffffffffffffff ffffffffffffffff + ffffffffffffffff ffffffffffffffff ffffffffffffffff + ffffffffffffffff ffffffffffffffff ffffffffffffffff + ffffffffffffffff + 8000000000000000 8000000000000000 8000000000000000 + 8000000000000000 8000000000000000 8000000000000000 + 8000000000000000 8000000000000000 8000000000000000 + 8000000000000000 8000000000000000 8000000000000000 + 8000000000000000 8000000000000000 8000000000000000 + 8000000000000000 + 800000000000000 800000000000000 800000000000000 800000000000000 + 800000000000000 800000000000000 800000000000000 800000000000000 + 800000000000000 800000000000000 800000000000000 800000000000000 + 800000000000000 800000000000000 800000000000000 800000000000000 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb new file mode 100644 index 0000000000..88928fda29 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb @@ -0,0 +1 @@ +1<<0t63,10=P diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out new file mode 100644 index 0000000000..65e05e7220 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out @@ -0,0 +1,6 @@ + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb new file mode 100644 index 0000000000..9f55408276 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb @@ -0,0 +1,4 @@ +1=RRRR +1<<0t62=RRR +1<<0t63=RRR +-1=RRRR diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out new file mode 100644 index 0000000000..f05b0bac4d --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out @@ -0,0 +1,14 @@ + 1 + 1 + 1 + 1 + 100000000000000000000000000000000000000000000000000000000000000 + 100000000000000000000000000000000000000000000000000000000000000 + 100000000000000000000000000000000000000000000000000000000000000 + 1000000000000000000000000000000000000000000000000000000000000000 + 1000000000000000000000000000000000000000000000000000000000000000 + 1000000000000000000000000000000000000000000000000000000000000000 + 1111111111111111111111111111111111111111111111111111111111111111 + 1111111111111111111111111111111111111111111111111111111111111111 + 1111111111111111111111111111111111111111111111111111111111111111 + 1111111111111111111111111111111111111111111111111111111111111111 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb new file mode 100644 index 0000000000..79d4b25af4 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb @@ -0,0 +1,2 @@ +-1,10=e +1<<0t63,10=e diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb.out new file mode 100644 index 0000000000..909c53cbc0 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb.out @@ -0,0 +1,12 @@ + -1 -1 -1 + -1 -1 -1 + -1 -1 -1 + -1 -1 -1 + -1 -1 -1 + -1 + -9223372036854775808 -9223372036854775808 -9223372036854775808 + -9223372036854775808 -9223372036854775808 -9223372036854775808 + -9223372036854775808 -9223372036854775808 -9223372036854775808 + -9223372036854775808 -9223372036854775808 -9223372036854775808 + -9223372036854775808 -9223372036854775808 -9223372036854775808 + -9223372036854775808 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb new file mode 100644 index 0000000000..b3397d21ed --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb @@ -0,0 +1,5 @@ +-1,10=g +1<<0t63,10=g +(1<<0t63)-1,10=g +1<<0t60,10=g +1<<0t57,10=g diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb.out new file mode 100644 index 0000000000..c46dff3594 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb.out @@ -0,0 +1,40 @@ + -1 -1 + -1 -1 + -1 -1 + -1 -1 + -1 -1 + -1 -1 + -1 -1 + -1 -1 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + -1000000000000000000000 -1000000000000000000000 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 777777777777777777777 777777777777777777777 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 100000000000000000000 100000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 + 10000000000000000000 10000000000000000000 diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb new file mode 100644 index 0000000000..875a1e178f --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb @@ -0,0 +1,8 @@ +-1=JRjnn +0=JRjnn +1=JRjnn +feedface=JRjnn +badfeedcafe=JRjnn +deadba11e12a=JRjnn +badb100d=JRjnn +baddefec8ed=JRjnn diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb.out new file mode 100644 index 0000000000..3f5fa0afaf --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb.out @@ -0,0 +1,238 @@ + ffffffffffffffff + 1111111111111111111111111111111111111111111111111111111111111111 + 1111111111111111111111111111111111111111111111111111111111111111 + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+-- bit 0 mask 0x0000000000000001 + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+--- bit 1 mask 0x0000000000000002 + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+---- bit 2 mask 0x0000000000000004 + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+----- bit 3 mask 0x0000000000000008 + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+------ bit 4 mask 0x0000000000000010 + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||+------- bit 5 mask 0x0000000000000020 + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||+-------- bit 6 mask 0x0000000000000040 + ||||||||||||||||||||||||||||||||||||||||||||||||||||||||+--------- bit 7 mask 0x0000000000000080 + |||||||||||||||||||||||||||||||||||||||||||||||||||||||+---------- bit 8 mask 0x0000000000000100 + ||||||||||||||||||||||||||||||||||||||||||||||||||||||+----------- bit 9 mask 0x0000000000000200 + |||||||||||||||||||||||||||||||||||||||||||||||||||||+------------ bit 10 mask 0x0000000000000400 + ||||||||||||||||||||||||||||||||||||||||||||||||||||+------------- bit 11 mask 0x0000000000000800 + |||||||||||||||||||||||||||||||||||||||||||||||||||+-------------- bit 12 mask 0x0000000000001000 + ||||||||||||||||||||||||||||||||||||||||||||||||||+--------------- bit 13 mask 0x0000000000002000 + |||||||||||||||||||||||||||||||||||||||||||||||||+---------------- bit 14 mask 0x0000000000004000 + ||||||||||||||||||||||||||||||||||||||||||||||||+----------------- bit 15 mask 0x0000000000008000 + |||||||||||||||||||||||||||||||||||||||||||||||+------------------ bit 16 mask 0x0000000000010000 + ||||||||||||||||||||||||||||||||||||||||||||||+------------------- bit 17 mask 0x0000000000020000 + |||||||||||||||||||||||||||||||||||||||||||||+-------------------- bit 18 mask 0x0000000000040000 + ||||||||||||||||||||||||||||||||||||||||||||+--------------------- bit 19 mask 0x0000000000080000 + |||||||||||||||||||||||||||||||||||||||||||+---------------------- bit 20 mask 0x0000000000100000 + ||||||||||||||||||||||||||||||||||||||||||+----------------------- bit 21 mask 0x0000000000200000 + |||||||||||||||||||||||||||||||||||||||||+------------------------ bit 22 mask 0x0000000000400000 + ||||||||||||||||||||||||||||||||||||||||+------------------------- bit 23 mask 0x0000000000800000 + |||||||||||||||||||||||||||||||||||||||+-------------------------- bit 24 mask 0x0000000001000000 + ||||||||||||||||||||||||||||||||||||||+--------------------------- bit 25 mask 0x0000000002000000 + |||||||||||||||||||||||||||||||||||||+---------------------------- bit 26 mask 0x0000000004000000 + ||||||||||||||||||||||||||||||||||||+----------------------------- bit 27 mask 0x0000000008000000 + |||||||||||||||||||||||||||||||||||+------------------------------ bit 28 mask 0x0000000010000000 + ||||||||||||||||||||||||||||||||||+------------------------------- bit 29 mask 0x0000000020000000 + |||||||||||||||||||||||||||||||||+-------------------------------- bit 30 mask 0x0000000040000000 + ||||||||||||||||||||||||||||||||+--------------------------------- bit 31 mask 0x0000000080000000 + |||||||||||||||||||||||||||||||+---------------------------------- bit 32 mask 0x0000000100000000 + ||||||||||||||||||||||||||||||+----------------------------------- bit 33 mask 0x0000000200000000 + |||||||||||||||||||||||||||||+------------------------------------ bit 34 mask 0x0000000400000000 + ||||||||||||||||||||||||||||+------------------------------------- bit 35 mask 0x0000000800000000 + |||||||||||||||||||||||||||+-------------------------------------- bit 36 mask 0x0000001000000000 + ||||||||||||||||||||||||||+--------------------------------------- bit 37 mask 0x0000002000000000 + |||||||||||||||||||||||||+---------------------------------------- bit 38 mask 0x0000004000000000 + ||||||||||||||||||||||||+----------------------------------------- bit 39 mask 0x0000008000000000 + |||||||||||||||||||||||+------------------------------------------ bit 40 mask 0x0000010000000000 + ||||||||||||||||||||||+------------------------------------------- bit 41 mask 0x0000020000000000 + |||||||||||||||||||||+-------------------------------------------- bit 42 mask 0x0000040000000000 + ||||||||||||||||||||+--------------------------------------------- bit 43 mask 0x0000080000000000 + |||||||||||||||||||+---------------------------------------------- bit 44 mask 0x0000100000000000 + ||||||||||||||||||+----------------------------------------------- bit 45 mask 0x0000200000000000 + |||||||||||||||||+------------------------------------------------ bit 46 mask 0x0000400000000000 + ||||||||||||||||+------------------------------------------------- bit 47 mask 0x0000800000000000 + |||||||||||||||+-------------------------------------------------- bit 48 mask 0x0001000000000000 + ||||||||||||||+--------------------------------------------------- bit 49 mask 0x0002000000000000 + |||||||||||||+---------------------------------------------------- bit 50 mask 0x0004000000000000 + ||||||||||||+----------------------------------------------------- bit 51 mask 0x0008000000000000 + |||||||||||+------------------------------------------------------ bit 52 mask 0x0010000000000000 + ||||||||||+------------------------------------------------------- bit 53 mask 0x0020000000000000 + |||||||||+-------------------------------------------------------- bit 54 mask 0x0040000000000000 + ||||||||+--------------------------------------------------------- bit 55 mask 0x0080000000000000 + |||||||+---------------------------------------------------------- bit 56 mask 0x0100000000000000 + ||||||+----------------------------------------------------------- bit 57 mask 0x0200000000000000 + |||||+------------------------------------------------------------ bit 58 mask 0x0400000000000000 + ||||+------------------------------------------------------------- bit 59 mask 0x0800000000000000 + |||+-------------------------------------------------------------- bit 60 mask 0x1000000000000000 + ||+--------------------------------------------------------------- bit 61 mask 0x2000000000000000 + |+---------------------------------------------------------------- bit 62 mask 0x4000000000000000 + +----------------------------------------------------------------- bit 63 mask 0x8000000000000000 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + | + +-- bit 0 mask 0x1 + + + feedface + 11111110111011011111101011001110 + 11111110111011011111101011001110 + ||||||| ||| || |||||| | || ||| + ||||||| ||| || |||||| | || ||+--- bit 1 mask 0x00000002 + ||||||| ||| || |||||| | || |+---- bit 2 mask 0x00000004 + ||||||| ||| || |||||| | || +----- bit 3 mask 0x00000008 + ||||||| ||| || |||||| | |+-------- bit 6 mask 0x00000040 + ||||||| ||| || |||||| | +--------- bit 7 mask 0x00000080 + ||||||| ||| || |||||| +----------- bit 9 mask 0x00000200 + ||||||| ||| || |||||+------------- bit 11 mask 0x00000800 + ||||||| ||| || ||||+-------------- bit 12 mask 0x00001000 + ||||||| ||| || |||+--------------- bit 13 mask 0x00002000 + ||||||| ||| || ||+---------------- bit 14 mask 0x00004000 + ||||||| ||| || |+----------------- bit 15 mask 0x00008000 + ||||||| ||| || +------------------ bit 16 mask 0x00010000 + ||||||| ||| |+-------------------- bit 18 mask 0x00040000 + ||||||| ||| +--------------------- bit 19 mask 0x00080000 + ||||||| ||+----------------------- bit 21 mask 0x00200000 + ||||||| |+------------------------ bit 22 mask 0x00400000 + ||||||| +------------------------- bit 23 mask 0x00800000 + ||||||+--------------------------- bit 25 mask 0x02000000 + |||||+---------------------------- bit 26 mask 0x04000000 + ||||+----------------------------- bit 27 mask 0x08000000 + |||+------------------------------ bit 28 mask 0x10000000 + ||+------------------------------- bit 29 mask 0x20000000 + |+-------------------------------- bit 30 mask 0x40000000 + +--------------------------------- bit 31 mask 0x80000000 + + + badfeedcafe + 10111010110111111110111011011100101011111110 + 10111010110111111110111011011100101011111110 + | ||| | || |||||||| ||| || ||| | | ||||||| + | ||| | || |||||||| ||| || ||| | | ||||||+--- bit 1 mask 0x00000000002 + | ||| | || |||||||| ||| || ||| | | |||||+---- bit 2 mask 0x00000000004 + | ||| | || |||||||| ||| || ||| | | ||||+----- bit 3 mask 0x00000000008 + | ||| | || |||||||| ||| || ||| | | |||+------ bit 4 mask 0x00000000010 + | ||| | || |||||||| ||| || ||| | | ||+------- bit 5 mask 0x00000000020 + | ||| | || |||||||| ||| || ||| | | |+-------- bit 6 mask 0x00000000040 + | ||| | || |||||||| ||| || ||| | | +--------- bit 7 mask 0x00000000080 + | ||| | || |||||||| ||| || ||| | +----------- bit 9 mask 0x00000000200 + | ||| | || |||||||| ||| || ||| +------------- bit 11 mask 0x00000000800 + | ||| | || |||||||| ||| || ||+---------------- bit 14 mask 0x00000004000 + | ||| | || |||||||| ||| || |+----------------- bit 15 mask 0x00000008000 + | ||| | || |||||||| ||| || +------------------ bit 16 mask 0x00000010000 + | ||| | || |||||||| ||| |+-------------------- bit 18 mask 0x00000040000 + | ||| | || |||||||| ||| +--------------------- bit 19 mask 0x00000080000 + | ||| | || |||||||| ||+----------------------- bit 21 mask 0x00000200000 + | ||| | || |||||||| |+------------------------ bit 22 mask 0x00000400000 + | ||| | || |||||||| +------------------------- bit 23 mask 0x00000800000 + | ||| | || |||||||+--------------------------- bit 25 mask 0x00002000000 + | ||| | || ||||||+---------------------------- bit 26 mask 0x00004000000 + | ||| | || |||||+----------------------------- bit 27 mask 0x00008000000 + | ||| | || ||||+------------------------------ bit 28 mask 0x00010000000 + | ||| | || |||+------------------------------- bit 29 mask 0x00020000000 + | ||| | || ||+-------------------------------- bit 30 mask 0x00040000000 + | ||| | || |+--------------------------------- bit 31 mask 0x00080000000 + | ||| | || +---------------------------------- bit 32 mask 0x00100000000 + | ||| | |+------------------------------------ bit 34 mask 0x00400000000 + | ||| | +------------------------------------- bit 35 mask 0x00800000000 + | ||| +--------------------------------------- bit 37 mask 0x02000000000 + | ||+----------------------------------------- bit 39 mask 0x08000000000 + | |+------------------------------------------ bit 40 mask 0x10000000000 + | +------------------------------------------- bit 41 mask 0x20000000000 + +--------------------------------------------- bit 43 mask 0x80000000000 + + + deadba11e12a + 110111101010110110111010000100011110000100101010 + 110111101010110110111010000100011110000100101010 + || |||| | | || || ||| | | |||| | | | | + || |||| | | || || ||| | | |||| | | | +--- bit 1 mask 0x000000000002 + || |||| | | || || ||| | | |||| | | +----- bit 3 mask 0x000000000008 + || |||| | | || || ||| | | |||| | +------- bit 5 mask 0x000000000020 + || |||| | | || || ||| | | |||| +---------- bit 8 mask 0x000000000100 + || |||| | | || || ||| | | |||+--------------- bit 13 mask 0x000000002000 + || |||| | | || || ||| | | ||+---------------- bit 14 mask 0x000000004000 + || |||| | | || || ||| | | |+----------------- bit 15 mask 0x000000008000 + || |||| | | || || ||| | | +------------------ bit 16 mask 0x000000010000 + || |||| | | || || ||| | +---------------------- bit 20 mask 0x000000100000 + || |||| | | || || ||| +--------------------------- bit 25 mask 0x000002000000 + || |||| | | || || ||+----------------------------- bit 27 mask 0x000008000000 + || |||| | | || || |+------------------------------ bit 28 mask 0x000010000000 + || |||| | | || || +------------------------------- bit 29 mask 0x000020000000 + || |||| | | || |+--------------------------------- bit 31 mask 0x000080000000 + || |||| | | || +---------------------------------- bit 32 mask 0x000100000000 + || |||| | | |+------------------------------------ bit 34 mask 0x000400000000 + || |||| | | +------------------------------------- bit 35 mask 0x000800000000 + || |||| | +--------------------------------------- bit 37 mask 0x002000000000 + || |||| +----------------------------------------- bit 39 mask 0x008000000000 + || |||+------------------------------------------- bit 41 mask 0x020000000000 + || ||+-------------------------------------------- bit 42 mask 0x040000000000 + || |+--------------------------------------------- bit 43 mask 0x080000000000 + || +---------------------------------------------- bit 44 mask 0x100000000000 + |+------------------------------------------------ bit 46 mask 0x400000000000 + +------------------------------------------------- bit 47 mask 0x800000000000 + + + badb100d + 10111010110110110001000000001101 + 10111010110110110001000000001101 + | ||| | || || || | || | + | ||| | || || || | || +-- bit 0 mask 0x00000001 + | ||| | || || || | |+---- bit 2 mask 0x00000004 + | ||| | || || || | +----- bit 3 mask 0x00000008 + | ||| | || || || +-------------- bit 12 mask 0x00001000 + | ||| | || || |+------------------ bit 16 mask 0x00010000 + | ||| | || || +------------------- bit 17 mask 0x00020000 + | ||| | || |+--------------------- bit 19 mask 0x00080000 + | ||| | || +---------------------- bit 20 mask 0x00100000 + | ||| | |+------------------------ bit 22 mask 0x00400000 + | ||| | +------------------------- bit 23 mask 0x00800000 + | ||| +--------------------------- bit 25 mask 0x02000000 + | ||+----------------------------- bit 27 mask 0x08000000 + | |+------------------------------ bit 28 mask 0x10000000 + | +------------------------------- bit 29 mask 0x20000000 + +--------------------------------- bit 31 mask 0x80000000 + + + baddefec8ed + 10111010110111011110111111101100100011101101 + 10111010110111011110111111101100100011101101 + | ||| | || ||| |||| ||||||| || | ||| || | + | ||| | || ||| |||| ||||||| || | ||| || +-- bit 0 mask 0x00000000001 + | ||| | || ||| |||| ||||||| || | ||| |+---- bit 2 mask 0x00000000004 + | ||| | || ||| |||| ||||||| || | ||| +----- bit 3 mask 0x00000000008 + | ||| | || ||| |||| ||||||| || | ||+------- bit 5 mask 0x00000000020 + | ||| | || ||| |||| ||||||| || | |+-------- bit 6 mask 0x00000000040 + | ||| | || ||| |||| ||||||| || | +--------- bit 7 mask 0x00000000080 + | ||| | || ||| |||| ||||||| || +------------- bit 11 mask 0x00000000800 + | ||| | || ||| |||| ||||||| |+---------------- bit 14 mask 0x00000004000 + | ||| | || ||| |||| ||||||| +----------------- bit 15 mask 0x00000008000 + | ||| | || ||| |||| ||||||+------------------- bit 17 mask 0x00000020000 + | ||| | || ||| |||| |||||+-------------------- bit 18 mask 0x00000040000 + | ||| | || ||| |||| ||||+--------------------- bit 19 mask 0x00000080000 + | ||| | || ||| |||| |||+---------------------- bit 20 mask 0x00000100000 + | ||| | || ||| |||| ||+----------------------- bit 21 mask 0x00000200000 + | ||| | || ||| |||| |+------------------------ bit 22 mask 0x00000400000 + | ||| | || ||| |||| +------------------------- bit 23 mask 0x00000800000 + | ||| | || ||| |||+--------------------------- bit 25 mask 0x00002000000 + | ||| | || ||| ||+---------------------------- bit 26 mask 0x00004000000 + | ||| | || ||| |+----------------------------- bit 27 mask 0x00008000000 + | ||| | || ||| +------------------------------ bit 28 mask 0x00010000000 + | ||| | || ||+-------------------------------- bit 30 mask 0x00040000000 + | ||| | || |+--------------------------------- bit 31 mask 0x00080000000 + | ||| | || +---------------------------------- bit 32 mask 0x00100000000 + | ||| | |+------------------------------------ bit 34 mask 0x00400000000 + | ||| | +------------------------------------- bit 35 mask 0x00800000000 + | ||| +--------------------------------------- bit 37 mask 0x02000000000 + | ||+----------------------------------------- bit 39 mask 0x08000000000 + | |+------------------------------------------ bit 40 mask 0x10000000000 + | +------------------------------------------- bit 41 mask 0x20000000000 + +--------------------------------------------- bit 43 mask 0x80000000000 + + diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb new file mode 100644 index 0000000000..ee2b989d1b --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb @@ -0,0 +1 @@ +1<<0t63,10=p diff --git a/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb.out new file mode 100644 index 0000000000..65e05e7220 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb.out @@ -0,0 +1,6 @@ + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 0x8000000000000000 0x8000000000000000 + 0x8000000000000000 diff --git a/usr/src/test/util-tests/tests/mdb/mdbtest b/usr/src/test/util-tests/tests/mdb/mdbtest new file mode 100755 index 0000000000..96ffdc4c2d --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/mdbtest @@ -0,0 +1,231 @@ +#!/bin/bash +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Joyent, Inc. +# + +# +# mdb test driver +# +unalias -a +shopt -s xpg_echo +#set -o xtrace + +mt_arg0=$(basename $0) +mt_ksh="/usr/bin/ksh" +mt_mdb="/usr/bin/mdb" +mt_outdir= +mt_keep= +mt_all= +mt_tests= +mt_tnum=0 +mt_tfail=0 +mt_tsuc=0 + +function usage +{ + local msg="$*" + [[ -z "$msg" ]] || echo "$msg" 2>&1 + cat <<USAGE >&2 +Usage: $mt_arg0 [ -o dir ] [ -k ] [ -m executable ] [ -a | test ... ] + + -o dir Sets 'dir' as the output directory + -k Keep output from all tests, not just failures + -m mdb binary to test +USAGE + exit 2 +} + +function fatal +{ + local msg="$*" + [[ -z "$msg" ]] && msg="failed" + echo "$mt_arg0: $msg" >&2 + exit 1 +} + +function setup_outdir +{ + mt_outdir="$mt_outdir/$mt_arg0.$$" + mkdir -p $mt_outdir || fatal "failed to make output dir $mt_outdir" +} + +function run_single +{ + local name=$1 + local expect base ext exe command odir res reason input + + [[ -z "$name" ]] && fail "missing test to run" + base=${name##*/} + ext=${base##*.} + expect=${base%%.*} + odir="$mt_outdir/current" + [[ -z "$ext" ]] && fatal "found test without ext: $name" + [[ -z "$expect" ]] && fatal "found test without prefix: $name" + + case "$ext" in + "ksh") + command="$mt_ksh $name" + ;; + "mdb") + command="$mt_mdb" + input="$name" + ;; + "out") + # + # This is the file format for checking output against. + # + return 0 + ;; + *) + echo "skipping test $name (unknown extensino)" + return 0 + ;; + esac + + echo "Executing test $name ... \c" + mkdir -p "$odir" >/dev/null || fatal "can't make output directory" + if [[ -z "$input" ]]; then + MDB=$mt_mdb $command > "$odir/stdout" 2>"$odir/stderr" + res=$? + else + MDB=$mt_mdb $command < $input > "$odir/stdout" 2>"$odir/stderr" + res=$? + fi + + if [[ -f "$name.out" ]] && ! diff "$name.out" "$odir/stdout" >/dev/null; then + cp $name.out $odir/$base.out + reason="stdout mismatch" + elif [[ "$expect" == "tst" && $res -ne 0 ]]; then + reason="test exited $res, not zero" + elif [[ "$expect" == "err" && $res -eq 0 ]]; then + reason="test exited $res, not non-zero" + fi + + if [[ -n "$reason" ]]; then + echo "$reason" + ((mt_tfail++)) + mv "$odir" "$mt_outdir/failure.$mt_tfail" || fatal \ + "failed to move test output directory" + cp "$name" "$mt_outdir/failure.$mt_tfail/test" || fatal \ + "failed to copy test into output directory" + else + echo "passed" + ((mt_tsuc++)) + mv "$odir" "$mt_outdir/success.$mt_tsuc" || fatal \ + "failed to move test directory" + fi + + ((mt_tnum++)) +} + +function run_all +{ + local tests t + + tests=$(find . -type f -name '[tst,err]*.*.[ksh,mdb]*') + for t in $tests; do + run_single $t + done +} + +function welcome +{ + cat <<WELCOME +Starting tests... +mtest target: $mt_mdb +output directory: $mt_outdir +WELCOME +} + +function cleanup +{ + [[ -n "$mt_keep" ]] && return + rm -rf "$mt_outdir"/success.* || fatal \ + "failed to remove successful test cases" + if [[ $mt_tfail -eq 0 ]]; then + rmdir "$mt_outdir" || fatal \ + "failed to remove test output directory" + fi +} + +function goodbye +{ + cat <<EOF + +------------- +Results +------------- + +Tests passed: $mt_tsuc +Tests failed: $mt_tfail +Tests ran: $mt_tnum + +EOF + if [[ $mt_tfail -eq 0 ]]; then + echo "Congrats, mdb isn't completely broken, the tests pass". + else + echo "Some tests failed, you have some work to do." + fi +} + +while getopts ":hko:m:" c $@; do + case "$c" in + k) + mt_keep="y" + ;; + m) + mt_mdb="$OPTARG" + ;; + o) + mt_outdir="$OPTARG" + ;; + h) + usage + ;; + :) + usage "option requires an argument -- $OPTARG" + ;; + *) + usage "invalid option -- $OPTARG" + ;; + esac +done + +shift $((OPTIND-1)) + +[[ $# == 0 ]] && mt_all="y" + +[[ -x "$mt_mdb" ]] || fatal "unable to execute mdb binary: $mt_mdb" + +[[ -z "$mt_outdir" ]] && mt_outdir=/var/tmp + +setup_outdir +welcome + +if [[ ! -z "$mt_all" ]]; then + run_all +else + for t in $@; do + [[ -f $t ]] || fatal "cannot find test $t" + run_single $t + done +fi + +goodbye +cleanup + +# +# Exit 1 if we have tests that return non-zero +# +[[ $mt_tfai -eq 0 ]] diff --git a/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb new file mode 100644 index 0000000000..5904cbf4c7 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb @@ -0,0 +1,15 @@ +::set +o autowrap +::typedef -c lp32 +0::printf "Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts! Amazingly few discotheques provide jukeboxes.%d" int . + +0::printf "%-79d%d" int . . +0::printf "%-80d%d" int . . +0::printf "%-81d%d" int . . + +::set -o autowrap +0::printf "Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts! Amazingly few discotheques provide jukeboxes.%d" int . + +0::printf "%-79d%d" int . . +0::printf "%-80d%d" int . . +0::printf "%-81d%d" int . . + diff --git a/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb.out b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb.out new file mode 100644 index 0000000000..81d3ef5293 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb.out @@ -0,0 +1,11 @@ +Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts! Amazingly few discotheques provide jukeboxes.0 +0 0 +0 0 +0 0 +Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level s +ix piqued gymnasts! Amazingly few discotheques provide jukeboxes.0 +0 0 +0 +0 +0 +0 diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh new file mode 100644 index 0000000000..f297cf99f1 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef lp32; ::typedef uint8_t 42foo' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh new file mode 100644 index 0000000000..5c7582b89c --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef lp32; ::typedef uint8_t %foo' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badmodel.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badmodel.ksh new file mode 100644 index 0000000000..28d6cf05a5 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badmodel.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c LLP64' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh new file mode 100644 index 0000000000..3543aab1df --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[7]; {} void {**white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh new file mode 100644 index 0000000000..ec41576179 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[-3]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh new file mode 100644 index 0000000000..b91094ae44 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[7; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh new file mode 100644 index 0000000000..4fe23fcee2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh new file mode 100644 index 0000000000..9fe7e77200 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone7]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh new file mode 100644 index 0000000000..d50d8e3fb9 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct uintptr_t stone[7]; void **white;" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh new file mode 100644 index 0000000000..4b20fac8c5 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[7]; void **white; " gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh new file mode 100644 index 0000000000..9fd82a01cc --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh new file mode 100644 index 0000000000..e1e4eacf13 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { void; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh new file mode 100644 index 0000000000..9ab93a792f --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[7]; void **white }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh new file mode 100644 index 0000000000..450b35ade2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct uintptr_t stone[7]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh new file mode 100644 index 0000000000..789caf63b0 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef struct { uintptr_t stone[7]; void **white; } gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh new file mode 100644 index 0000000000..c00aca88fb --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[7]; void **stone; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh new file mode 100644 index 0000000000..a678d136b6 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[]; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh new file mode 100644 index 0000000000..7999c97a5a --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "struct { uintptr_t stone[0]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh new file mode 100644 index 0000000000..57a82a7752 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "union { int foo; uintptr_t stone[]; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.extraargs.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.extraargs.ksh new file mode 100644 index 0000000000..510797265b --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.extraargs.ksh @@ -0,0 +1 @@ +$MDB -e "::typedef -c lp32; ::typedef uint8_t rm_t extra_t" diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.noargs.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.noargs.ksh new file mode 100644 index 0000000000..77eeacc5f2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.noargs.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.nokeyword.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.nokeyword.ksh new file mode 100644 index 0000000000..9a5e1a1fcc --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.nokeyword.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c lp32; ::typedef "{ uintptr_t stone[7]; void **white; }" gift_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.nomodel.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.nomodel.ksh new file mode 100644 index 0000000000..4614ac23d6 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.nomodel.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef -c' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.noname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.noname.ksh new file mode 100644 index 0000000000..04ebca1204 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.noname.ksh @@ -0,0 +1 @@ +$MDB -e '::typedef int' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/err.typeexists.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.typeexists.ksh new file mode 100644 index 0000000000..a1158cd830 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/err.typeexists.ksh @@ -0,0 +1 @@ +$MDB /lib/libc.so -e '::typedef uint8_t uint16_t' diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb new file mode 100644 index 0000000000..27de9428c6 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb @@ -0,0 +1,4 @@ +::typedef -c lp32 +::typedef "struct { uintptr_t stone[7]; void **white; }" gift_t +::sizeof gift_t +::print -at gift_t diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out new file mode 100644 index 0000000000..605e0facfc --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out @@ -0,0 +1,5 @@ +sizeof (gift_t) = 0x28 +0 gift_t { + 0 uintptr_t [7] stone + 20 void **white +} diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb new file mode 100644 index 0000000000..1aa17b5366 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb @@ -0,0 +1,4 @@ +::typedef -c lp64 +::typedef "union { int frodo; char sam; long gandalf; }" ringbearer_t; +::sizeof ringbearer_t +::print -at ringbearer_t diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out new file mode 100644 index 0000000000..0a762dc1f8 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out @@ -0,0 +1,6 @@ +sizeof (ringbearer_t) = 8 +0 ringbearer_t { + 0 int frodo + 0 char sam + 0 long gandalf +} diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh new file mode 100644 index 0000000000..fabc7dfb57 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh @@ -0,0 +1,22 @@ +# +# One of the problems that we can encounter involves trying to typedef a struct +# that has an error in it. The problem here is that we actually create the type +# itself for the struct before we add members. So what we need is something that +# will fail validation. So here we go! +# + +TMPFILE="$(mktemp -p /tmp mtest.XXXXXX)" +if [[ -z "$TMPFILE" ]]; then + echo "Failed to get a temp file" 2>&1 + exit 1 +fi + +$MDB <<EOF +::typedef "struct foo { int r; }" foo_t +::typedef -l ! cat > $TMPFILE +EOF + +DATA=$(cat $TMPFILE) +rm -f $TMPFILE + +[[ -z $DATA ]] diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb new file mode 100644 index 0000000000..12c28075a8 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb @@ -0,0 +1,27 @@ +::typedef -c LP32 +::sizeof int8_t +::sizeof int16_t +::sizeof int32_t +::sizeof int64_t +::sizeof uint8_t +::sizeof uint16_t +::sizeof uint32_t +::sizeof uint64_t +::sizeof intptr_t +::sizeof uintptr_t +::sizeof uchar_t +::sizeof ushort_t +::sizeof uint_t +::sizeof ulong_t +::sizeof u_longlong_t +::sizeof ptrdiff_t +::sizeof signed +::sizeof unsigned +::sizeof void +::sizeof char +::sizeof short +::sizeof int +::sizeof long +::sizeof _Bool +::sizeof float +::sizeof double diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out new file mode 100644 index 0000000000..792f42fbf2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out @@ -0,0 +1,26 @@ +sizeof (int8_t) = 1 +sizeof (int16_t) = 2 +sizeof (int32_t) = 4 +sizeof (int64_t) = 8 +sizeof (uint8_t) = 1 +sizeof (uint16_t) = 2 +sizeof (uint32_t) = 4 +sizeof (uint64_t) = 8 +sizeof (intptr_t) = 4 +sizeof (uintptr_t) = 4 +sizeof (uchar_t) = 1 +sizeof (ushort_t) = 2 +sizeof (uint_t) = 4 +sizeof (ulong_t) = 4 +sizeof (u_longlong_t) = 8 +sizeof (ptrdiff_t) = 4 +sizeof (signed) = 4 +sizeof (unsigned) = 4 +sizeof (void) = 0 +sizeof (char) = 1 +sizeof (short) = 2 +sizeof (int) = 4 +sizeof (long) = 4 +sizeof (_Bool) = 1 +sizeof (float) = 4 +sizeof (double) = 8 diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb new file mode 100644 index 0000000000..5ae94cdea0 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb @@ -0,0 +1,27 @@ +::typedef -c LP64 +::sizeof int8_t +::sizeof int16_t +::sizeof int32_t +::sizeof int64_t +::sizeof uint8_t +::sizeof uint16_t +::sizeof uint32_t +::sizeof uint64_t +::sizeof intptr_t +::sizeof uintptr_t +::sizeof uchar_t +::sizeof ushort_t +::sizeof uint_t +::sizeof ulong_t +::sizeof u_longlong_t +::sizeof ptrdiff_t +::sizeof signed +::sizeof unsigned +::sizeof void +::sizeof char +::sizeof short +::sizeof int +::sizeof long +::sizeof _Bool +::sizeof float +::sizeof double diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out new file mode 100644 index 0000000000..83b85b943a --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out @@ -0,0 +1,26 @@ +sizeof (int8_t) = 1 +sizeof (int16_t) = 2 +sizeof (int32_t) = 4 +sizeof (int64_t) = 8 +sizeof (uint8_t) = 1 +sizeof (uint16_t) = 2 +sizeof (uint32_t) = 4 +sizeof (uint64_t) = 8 +sizeof (intptr_t) = 8 +sizeof (uintptr_t) = 8 +sizeof (uchar_t) = 1 +sizeof (ushort_t) = 2 +sizeof (uint_t) = 4 +sizeof (ulong_t) = 8 +sizeof (u_longlong_t) = 8 +sizeof (ptrdiff_t) = 8 +sizeof (signed) = 4 +sizeof (unsigned) = 4 +sizeof (void) = 0 +sizeof (char) = 1 +sizeof (short) = 2 +sizeof (int) = 4 +sizeof (long) = 8 +sizeof (_Bool) = 1 +sizeof (float) = 4 +sizeof (double) = 8 diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb new file mode 100644 index 0000000000..e9009d7b68 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb @@ -0,0 +1,3 @@ +::typdef -c lp32 +::typedef -d +::typedef -l diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb.out diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb new file mode 100644 index 0000000000..6c7505ac1c --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb @@ -0,0 +1 @@ +::typedef -l diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb.out new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb.out diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh new file mode 100644 index 0000000000..cf517cf937 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh @@ -0,0 +1,6 @@ +$MDB /lib/libc.so <<EOF +::typedef uint8_t rm_t +::typedef -l +::print -at rm_t +::sizeof rm_t +EOF diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh.out new file mode 100644 index 0000000000..d37ffafbfb --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh.out @@ -0,0 +1,4 @@ +uint8_t +rm_t +0 rm_t +sizeof (rm_t) = 1 diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.models.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.models.ksh new file mode 100644 index 0000000000..8537ec443c --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.models.ksh @@ -0,0 +1,11 @@ +lp64m="lp64 Lp64 LP64 lP64" +lp32m="lp32 Lp32 LP32 lP32" +ilp32m="ilp32 ilP32 iLp32 iLP32 Ilp32 IlP32 ILp32 ILP32" +for m in $lp64m $lp32m $ilp32m; do + $MDB -e "::typedef -c $m" + if [[ ! $? -eq 0 ]]; then + echo "failed to create model $m" 2>&1 + exit 1 + fi +done +exit 0 diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb new file mode 100644 index 0000000000..2e0206e7ec --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb @@ -0,0 +1,6 @@ +::typedef -c lp32 +::typedef "struct gift { uintptr_t stone[7]; void **white; }" gift_t +::sizeof gift_t +::print -at gift_t +::sizeof struct gift +::print -at struct gift diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb.out new file mode 100644 index 0000000000..9a7d801742 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb.out @@ -0,0 +1,10 @@ +sizeof (gift_t) = 0x28 +0 gift_t { + 0 uintptr_t [7] stone + 20 void **white +} +sizeof (struct gift) = 0x28 +0 struct gift { + 0 uintptr_t [7] stone + 20 void **white +} diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb new file mode 100644 index 0000000000..85b3068e00 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb @@ -0,0 +1,4 @@ +::typedef -c lp32 +::typedef "struct list { struct list *prev; struct list *next; }" list_t +::sizeof list_t +::print -at list_t diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out new file mode 100644 index 0000000000..a6f4823ad1 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out @@ -0,0 +1,5 @@ +sizeof (list_t) = 0x10 +0 list_t { + 0 struct list *prev + 8 struct list *next +} diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb new file mode 100644 index 0000000000..27cd56c186 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb @@ -0,0 +1,4 @@ +::typedef -c lp32 +::typedef "struct gift { uintptr_t stone[7]; void **white; char owner[]; }" gift_t +::sizeof gift_t +::print -at gift_t diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb.out new file mode 100644 index 0000000000..0a0d3d4029 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb.out @@ -0,0 +1,6 @@ +sizeof (gift_t) = 0x28 +0 gift_t { + 0 uintptr_t [7] stone + 20 void **white + 28 char [0] owner +} diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb new file mode 100644 index 0000000000..966446caee --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb @@ -0,0 +1,6 @@ +::typedef -c lp64 +::typedef "union ringbearer { int frodo; char sam; long gandalf; }" ringbearer_t; +::sizeof ringbearer_t +::print -at ringbearer_t +::sizeof union ringbearer +::print -at union ringbearer diff --git a/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb.out new file mode 100644 index 0000000000..2afc2eabb9 --- /dev/null +++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb.out @@ -0,0 +1,12 @@ +sizeof (ringbearer_t) = 8 +0 ringbearer_t { + 0 int frodo + 0 char sam + 0 long gandalf +} +sizeof (union ringbearer) = 8 +0 union ringbearer { + 0 int frodo + 0 char sam + 0 long gandalf +} diff --git a/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/Makefile b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/Makefile index 2034d39599..5f8ea55a97 100644 --- a/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/Makefile @@ -11,15 +11,27 @@ # # Copyright (c) 2016 by Delphix. All rights reserved. +# Copyright 2020 Joyent, Inc. # include $(SRC)/Makefile.master +include $(SRC)/cmd/Makefile.cmd +include $(SRC)/cmd/Makefile.ctf ROOTOPTPKG = $(ROOT)/opt/zfs-tests TESTDIR = $(ROOTOPTPKG)/tests/functional/channel_program/synctask_core KSHFILES :sh= ls *.ksh -PROGS = $(KSHFILES:.ksh=) +KSHPROGS = $(KSHFILES:.ksh=) + +SRCS :sh= ls *.c +CPROGS = $(SRCS:%.c=%.exe) +LDLIBS = $(LDLIBS.cmd) +LDLIBS += -lzfs_core -lnvpair +CSTD = $(CSTD_GNU99) +OBJS = $(SRCS:%.c=%.o) + +PROGS = $(KSHPROGS) $(CPROGS) FILES :sh= ls *.zcp *.out *.err 2>/dev/null; true INSTPROGS = $(PROGS:%=$(TESTDIR)/%) @@ -28,7 +40,9 @@ INSTFILES = $(FILES:%=$(TESTDIR)/%) $(INSTPROGS) := FILEMODE = 0555 $(INSTFILES) := FILEMODE = 0444 -all lint clean clobber: +all: $(CPROGS) + +clean clobber: install: $(INSTPROGS) $(INSTFILES) @@ -43,3 +57,16 @@ $(TESTDIR)/%: %.ksh $(TESTDIR)/%: % $(INS.file) + +%.o: ../%.c + $(COMPILE.c) $< + +%.exe: %.o + $(LINK.c) $< -o $@ $(LDLIBS) + $(POST_PROCESS) + +clobber: clean + -$(RM) $(PROGS) + +clean: + -$(RM) $(OBJS) diff --git a/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/change_key.c b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/change_key.c new file mode 100644 index 0000000000..405c232b4e --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/change_key.c @@ -0,0 +1,98 @@ +/* + * CDDL HEADER START + * + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + * + * CDDL HEADER END + */ + +/* + * Copyright 2020 Joyent, Inc. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/debug.h> +#include <sys/fs/zfs.h> +#include <libzfs_core.h> +#include <libnvpair.h> + +const char prog[] = + "arg = ... \n" + "fs = arg[\"dataset\"]\n" + "hexkey = arg[\"" ZPOOL_HIDDEN_ARGS "\"][\"key\"]\n" + "err = zfs.sync.change_key(fs, hexkey, 'hex')\n" + "msg = \"changing key on \" .. fs .. \" err=\" .. err\n" + "return msg"; + +/* + * Get the pool name from a dataset. This is crude but good enough + * for a test. + */ +static char * +get_pool(const char *dataset) +{ + char *res = strdup(dataset); + + if (res == NULL) + abort(); + + char *p = strchr(res, '/'); + + if (p != NULL) + *p = '\0'; + + return (res); +} + +int +main(int argc, char *argv[]) +{ + const char *dataset = argv[1]; + const char *key = argv[2]; + char *pool = NULL; + nvlist_t *args = fnvlist_alloc(); + nvlist_t *hidden_args = fnvlist_alloc(); + nvlist_t *result = NULL; + int ret = 0; + + if (argc != 3) { + (void) fprintf(stderr, "Usage: %s dataset key\n", argv[0]); + exit(2); + } + + VERIFY0(libzfs_core_init()); + + pool = get_pool(dataset); + + fnvlist_add_string(args, "dataset", dataset); + fnvlist_add_string(hidden_args, "key", key); + fnvlist_add_nvlist(args, ZPOOL_HIDDEN_ARGS, hidden_args); + + ret = lzc_channel_program(pool, prog, ZCP_DEFAULT_INSTRLIMIT, + ZCP_DEFAULT_MEMLIMIT, args, &result); + + (void) printf("lzc_channel_program returned %d", ret); + if (ret != 0) + (void) printf(" (%s)", strerror(ret)); + (void) fputc('\n', stdout); + + dump_nvlist(result, 5); + + nvlist_free(args); + nvlist_free(hidden_args); + nvlist_free(result); + free(pool); + + libzfs_core_fini(); + + return (ret); +} diff --git a/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/tst.change_key.ksh b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/tst.change_key.ksh new file mode 100644 index 0000000000..5d505226b8 --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/channel_program/synctask_core/tst.change_key.ksh @@ -0,0 +1,56 @@ +#!/bin/ksh -p +# +# CDDL HEADER START +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# CDDL HEADER END +# + +# +# Copyright 2020 Joyent, Inc. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib +. $STF_SUITE/tests/functional/channel_program/channel_common.kshlib + +# +# DESCRIPTION: +# Try to change an encrypted dataset key via a ZFS channel program + +verify_runnable "both" + +function cleanup +{ + datasetexists $TESTPOOL/$TESTFS1 && \ + log_must zfs destroy -f $TESTPOOL/$TESTFS1 +} +log_onexit cleanup + +log_assert "zfs.sync.change_key should change key material" + +log_must eval "echo $HEXKEY | zfs create -o encryption=on" \ + "-o keyformat=hex -o keylocation=prompt $TESTPOOL/$TESTFS1" + +log_must $ZCP_ROOT/synctask_core/change_key.exe $TESTPOOL/$TESTFS1 $HEXKEY1 + +# Key shouldn't appear in zpool history when using change_key.exe +log_mustnot eval "zfs history -il $TESTPOOL | grep $HEXKEY1" + +log_must zfs unmount $TESTPOOL/$TESTFS1 +log_must zfs unload-key $TESTPOOL/$TESTFS1 + +log_mustnot eval "echo $HEXKEY | zfs load-key $TESTPOOL/$TESTFS1" +log_must key_unavailable $TESTPOOL/$TESTFS1 + +log_must eval "echo $HEXKEY1 | zfs load-key $TESTPOOL/$TESTFS1" + +log_pass "zfs.sync.change_key should change key material" |