[illumos-gate merge]

commit 388488112189b484c639b410a453c22e93bdfb68
    12304 risc-v dis instruction alignment too restrictive
commit 6de7dd38d5e1d12791b18f60b9cad431c7d4b419
    11861 hostbridge topo module should be hardened to handle empty busses
commit ac2f5fbefc05314fcd97b03f2338b39e6efe643f
    12370 mdb tests should be packaged
    12380 findtest needs listing in runfile

	Conflicts:
	usr/src/test/util-tests/tests/Makefile
	usr/src/pkg/manifests/system-test-utiltest.mf
	usr/src/cmd/mdb/test/mtest.sh [modified local, deleted upstream]

85 files changed, 248 insertions, 24 deletions

diff --git a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/hb_i86pc.c b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/hb_i86pc.c
index b8d89db32d..8968c70c95 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/hostbridge/hb_i86pc.c
+++ b/usr/src/lib/fm/topo/modules/i86pc/hostbridge/hb_i86pc.c
@@ -93,6 +93,18 @@ pci_hostbridges_find(topo_mod_t *mod, tnode_t *ptn)
 
 	pnode = di_drv_first_node(PCI, devtree);
 	while (pnode != DI_NODE_NIL) {
+		/*
+		 * We've seen cases where certain phantom PCI hostbridges have
+		 * appeared on systems. If we encounter a host bridge without a
+		 * bus address assigned to it, then we should skip processing it
+		 * here as that indicates that it generally doesn't have any
+		 * devices under it and we'll otherwise blow up in devinfo.
+		 */
+		if (di_bus_addr(pnode) == NULL) {
+			pnode = di_drv_next_node(pnode);
+			continue;
+		}
+
 		if (hb_process(mod, ptn, hbcnt, pnode) < 0) {
 			if (hbcnt == 0)
 				topo_node_range_destroy(ptn, HOSTBRIDGE);
diff --git a/usr/src/lib/libdisasm/common/dis_riscv.c b/usr/src/lib/libdisasm/common/dis_riscv.c
index fa7cc30610..f246a19137 100644
--- a/usr/src/lib/libdisasm/common/dis_riscv.c
+++ b/usr/src/lib/libdisasm/common/dis_riscv.c
@@ -313,7 +313,7 @@ typedef void (*dis_riscv_func_t)(dis_handle_t *, uint32_t,
     struct dis_riscv_instr *, char *, size_t);
 
 typedef struct dis_riscv_instr {
-	const char 		*drv_name;
+	const char		*drv_name;
 	dis_riscv_itype_t	drv_type;
 	dis_riscv_func_t	drv_print;
 	uint_t			drv_opcode;
@@ -959,7 +959,7 @@ dis_riscv_fp_rm(dis_handle_t *dhp, uint32_t instr,
 #define	DIS_RISCV_FP_R_RS2_IFP_NR(str, op, f3, rs2, f7)		\
 	{ str, DIS_RISCV_I_FP_R_RS2_TYPE, dis_riscv_fp_rs2_ifp_nr, op, f3, \
 	    f7, rs2 }
-#define	DIS_RISCV_FP_RI(str, op, f3, f7) 			\
+#define	DIS_RISCV_FP_RI(str, op, f3, f7)			\
 	{ str, DIS_RISCV_I_R_TYPE, dis_riscv_fp_r_fpi, op, f3, f7 }
 
 /*
@@ -1300,7 +1300,7 @@ typedef struct dis_riscv_c_instr {
 	const char		*drv_c_name;
 	dis_riscv_ctype_t	drv_c_type;
 	dis_riscv_c_func_t	drv_c_print;
-	dis_riscv_c_class_t 	drv_c_class;
+	dis_riscv_c_class_t	drv_c_class;
 	uint_t			drv_c_opcode;
 	uint_t			drv_c_funct;
 	uint_t			drv_c_mask;
@@ -1680,7 +1680,7 @@ dis_riscv_c_int(dis_handle_t *dhp, uint32_t instr,
 
 #define	DIS_RISCV_CFUNCT3(name, class, op, funct, print)		\
 	{ name, DIS_RISCV_C_FUNCT3, print, class, op, funct, 0, 0 }
-#define	DIS_RISCV_CMATCH(name, class, op, funct, mask, match, print) 	\
+#define	DIS_RISCV_CMATCH(name, class, op, funct, mask, match, print)	\
 	{ name, DIS_RISCV_C_MATCH, print, class, op, funct, mask, match }
 
 static dis_riscv_c_instr_t dis_riscv_2byte[] = {
@@ -1972,7 +1972,6 @@ dis_riscv_max_instrlen(dis_handle_t *dhp)
 static int
 dis_riscv_instrlen(dis_handle_t *dhp, uint64_t addr)
 {
-	int ret;
 	uint16_t parcel;
 
 	dhp->dh_addr = addr;
@@ -1980,15 +1979,7 @@ dis_riscv_instrlen(dis_handle_t *dhp, uint64_t addr)
 	if (dis_riscv_read_parcel(dhp, &parcel) != 0)
 		return (-1);
 
-	/*
-	 * Get length based on this parcel. Check for required alignment. 2-byte
-	 * alignment was already taken care of when we read the parcel.
-	 */
-	ret = dis_riscv_decode_len(parcel);
-	if (ret >= 4 && (addr % 4) != 0)
-		return (-1);
-
-	return (ret);
+	return (dis_riscv_decode_len(parcel));
 }
 
 dis_arch_t dis_arch_riscv = {
diff --git a/usr/src/pkg/manifests/system-test-utiltest.mf b/usr/src/pkg/manifests/system-test-utiltest.mf
index 72aaf86076..a33bea9e2e 100644
--- a/usr/src/pkg/manifests/system-test-utiltest.mf
+++ b/usr/src/pkg/manifests/system-test-utiltest.mf
@@ -68,6 +68,11 @@ dir path=opt/util-tests/tests/awk/examples/out
 dir path=opt/util-tests/tests/awk/gnu
 dir path=opt/util-tests/tests/awk/syn
 dir path=opt/util-tests/tests/awk/tests
+dir path=opt/util-tests/tests/mdb
+dir path=opt/util-tests/tests/mdb/exit-e
+dir path=opt/util-tests/tests/mdb/format
+dir path=opt/util-tests/tests/mdb/options
+dir path=opt/util-tests/tests/mdb/typedef
 dir path=opt/util-tests/tests/mergeq
 dir path=opt/util-tests/tests/sleep
 file path=opt/util-tests/README mode=0444
@@ -1479,6 +1484,95 @@ file path=opt/util-tests/tests/libsff/libsff_strings mode=0555
 file path=opt/util-tests/tests/libsff/libsff_wave mode=0555
 file path=opt/util-tests/tests/libsff/libsff_wave.out mode=0444
 file path=opt/util-tests/tests/make_test mode=0555
+file path=opt/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/err.enocmd.ksh mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/err.nowrite.ksh mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/err.unmapped.ksh mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/tst.output.ksh mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/tst.output.ksh.out mode=0444
+file path=opt/util-tests/tests/mdb/exit-e/tst.simple.ksh mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-E.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-G.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-J.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-P.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-R.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-e.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-e.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-g.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-g.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-j.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-j.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-p.mdb mode=0444
+file path=opt/util-tests/tests/mdb/format/tst.format-p.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/mdbtest mode=0555
+file path=opt/util-tests/tests/mdb/options/tst.autowrap.mdb mode=0444
+file path=opt/util-tests/tests/mdb/options/tst.autowrap.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badmodel.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh \
+    mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.extraargs.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.noargs.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.nokeyword.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.nomodel.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.noname.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/err.typeexists.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.anonstruct.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.anonunion.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.deftypes32.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.deftypes64.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.dellist.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.emptylist.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.libctype.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.libctype.ksh.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.models.ksh mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.struct.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.struct.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.structselfref.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.structvla.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.structvla.mdb.out mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.union.mdb mode=0444
+file path=opt/util-tests/tests/mdb/typedef/tst.union.mdb.out mode=0444
 file path=opt/util-tests/tests/mergeq/mqt mode=0555
 file path=opt/util-tests/tests/mergeq/wqt mode=0555
 file path=opt/util-tests/tests/printf_test mode=0555
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 df0f7a7709..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 find
+SUBDIRS += bunyan libcustr find mdb
 
 include $(SRC)/test/Makefile.com
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/cmd/mdb/test/README b/usr/src/test/util-tests/tests/mdb/README
index 28127e5916..28127e5916 100644
--- a/usr/src/cmd/mdb/test/README
+++ b/usr/src/test/util-tests/tests/mdb/README
diff --git a/usr/src/cmd/mdb/test/exit-e/err.cmdbadopt.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh
index de50faeb01..de50faeb01 100644
--- a/usr/src/cmd/mdb/test/exit-e/err.cmdbadopt.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.cmdbadopt.ksh
diff --git a/usr/src/cmd/mdb/test/exit-e/err.enocmd.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.enocmd.ksh
index 038f121b26..038f121b26 100644
--- a/usr/src/cmd/mdb/test/exit-e/err.enocmd.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.enocmd.ksh
diff --git a/usr/src/cmd/mdb/test/exit-e/err.nowrite.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.nowrite.ksh
index 8f0fda2253..8f0fda2253 100644
--- a/usr/src/cmd/mdb/test/exit-e/err.nowrite.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.nowrite.ksh
diff --git a/usr/src/cmd/mdb/test/exit-e/err.unmapped.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/err.unmapped.ksh
index 874283f186..874283f186 100644
--- a/usr/src/cmd/mdb/test/exit-e/err.unmapped.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/err.unmapped.ksh
diff --git a/usr/src/cmd/mdb/test/exit-e/tst.output.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh
index 13b5db072d..13b5db072d 100644
--- a/usr/src/cmd/mdb/test/exit-e/tst.output.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh
diff --git a/usr/src/cmd/mdb/test/exit-e/tst.output.ksh.out b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh.out
index 7a38ab6e65..7a38ab6e65 100644
--- a/usr/src/cmd/mdb/test/exit-e/tst.output.ksh.out
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.output.ksh.out
diff --git a/usr/src/cmd/mdb/test/exit-e/tst.simple.ksh b/usr/src/test/util-tests/tests/mdb/exit-e/tst.simple.ksh
index 4c8a3c58ad..4c8a3c58ad 100644
--- a/usr/src/cmd/mdb/test/exit-e/tst.simple.ksh
+++ b/usr/src/test/util-tests/tests/mdb/exit-e/tst.simple.ksh
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-E.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb
index 18e9053ce4..18e9053ce4 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-E.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-E.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out
index 2268a48be9..2268a48be9 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-E.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-E.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-G.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb
index f10f78336b..f10f78336b 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-G.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-G.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out
index f1dfd5193b..f1dfd5193b 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-G.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-G.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-J.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb
index ff9dabbce9..ff9dabbce9 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-J.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-J.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out
index 644fee231e..644fee231e 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-J.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-J.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-P.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb
index 88928fda29..88928fda29 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-P.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-P.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out
index 65e05e7220..65e05e7220 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-P.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-P.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-R.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb
index 9f55408276..9f55408276 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-R.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-cap-R.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out
index f05b0bac4d..f05b0bac4d 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-cap-R.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-cap-R.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-e.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb
index 79d4b25af4..79d4b25af4 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-e.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-e.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb.out
index 909c53cbc0..909c53cbc0 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-e.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-e.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-g.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb
index b3397d21ed..b3397d21ed 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-g.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-g.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb.out
index c46dff3594..c46dff3594 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-g.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-g.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-j.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb
index 875a1e178f..875a1e178f 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-j.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-j.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb.out
index 3f5fa0afaf..3f5fa0afaf 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-j.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-j.mdb.out
diff --git a/usr/src/cmd/mdb/test/format/tst.format-p.mdb b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb
index ee2b989d1b..ee2b989d1b 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-p.mdb
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb
diff --git a/usr/src/cmd/mdb/test/format/tst.format-p.mdb.out b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb.out
index 65e05e7220..65e05e7220 100644
--- a/usr/src/cmd/mdb/test/format/tst.format-p.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/format/tst.format-p.mdb.out
diff --git a/usr/src/cmd/mdb/test/mtest.sh b/usr/src/test/util-tests/tests/mdb/mdbtest
index f21d0faa21..96ffdc4c2d 100755
--- a/usr/src/cmd/mdb/test/mtest.sh
+++ b/usr/src/test/util-tests/tests/mdb/mdbtest
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2012 (c), Joyent, Inc.
+# Copyright 2020 Joyent, Inc.
 #
 
 #
@@ -40,7 +40,6 @@ function usage
 Usage: $mt_arg0  [ -o dir ] [ -k ] [ -m executable ] [ -a | test ... ]
 
 	-o dir		Sets 'dir' as the output directory
-	-a		Runs all tests, ignores tests passed in
 	-k		Keep output from all tests, not just failures
 	-m 		mdb binary to test
 USAGE
@@ -180,11 +179,8 @@ EOF
 	fi
 }
 
-while getopts ":ahko:m:" c $@; do
+while getopts ":hko:m:" c $@; do
 	case "$c" in
-	a)
-		mt_all="y"
-		;;
 	k)
 		mt_keep="y"
 		;;
@@ -208,7 +204,7 @@ done
 
 shift $((OPTIND-1))
 
-[[ -z "$mt_all" && $# == 0 ]] && usage "no tests to run"
+[[ $# == 0 ]] && mt_all="y"
 
 [[ -x "$mt_mdb" ]] || fatal "unable to execute mdb binary: $mt_mdb"
 
diff --git a/usr/src/cmd/mdb/test/options/tst.autowrap.mdb b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb
index 5904cbf4c7..5904cbf4c7 100644
--- a/usr/src/cmd/mdb/test/options/tst.autowrap.mdb
+++ b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb
diff --git a/usr/src/cmd/mdb/test/options/tst.autowrap.mdb.out b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb.out
index 81d3ef5293..81d3ef5293 100644
--- a/usr/src/cmd/mdb/test/options/tst.autowrap.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/options/tst.autowrap.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/err.badid-leadnum.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh
index f297cf99f1..f297cf99f1 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badid-leadnum.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadnum.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badid-leadschar.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh
index 5c7582b89c..5c7582b89c 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badid-leadschar.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badid-leadschar.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badmodel.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badmodel.ksh
index 28d6cf05a5..28d6cf05a5 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badmodel.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badmodel.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-extrabraces.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh
index 3543aab1df..3543aab1df 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-extrabraces.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-extrabraces.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-neglenarr.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh
index ec41576179..ec41576179 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-neglenarr.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-neglenarr.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarrayclose.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh
index b91094ae44..b91094ae44 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarrayclose.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayclose.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarraylen.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh
index 4fe23fcee2..4fe23fcee2 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarraylen.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarraylen.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarrayopen.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh
index 9fe7e77200..9fe7e77200 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noarrayopen.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noarrayopen.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-nobraces.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh
index d50d8e3fb9..d50d8e3fb9 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-nobraces.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nobraces.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noclosebrace.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh
index 4b20fac8c5..4b20fac8c5 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noclosebrace.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noclosebrace.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomembers.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh
index 9fd82a01cc..9fd82a01cc 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomembers.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomembers.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomemname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh
index e1e4eacf13..e1e4eacf13 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomemname.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemname.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomemsemi.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh
index 9ab93a792f..9ab93a792f 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-nomemsemi.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-nomemsemi.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noopenbrace.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh
index 450b35ade2..450b35ade2 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noopenbrace.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noopenbrace.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-noquotes.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh
index 789caf63b0..789caf63b0 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-noquotes.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-noquotes.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-repmemname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh
index c00aca88fb..c00aca88fb 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-repmemname.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-repmemname.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-vlaonly.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh
index a678d136b6..a678d136b6 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-vlaonly.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-vlaonly.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badstruct-zerolenarr.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh
index 7999c97a5a..7999c97a5a 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badstruct-zerolenarr.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badstruct-zerolenarr.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.badunion-hasvla.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh
index 57a82a7752..57a82a7752 100644
--- a/usr/src/cmd/mdb/test/typedef/err.badunion-hasvla.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.badunion-hasvla.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.extraargs.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.extraargs.ksh
index 510797265b..510797265b 100644
--- a/usr/src/cmd/mdb/test/typedef/err.extraargs.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.extraargs.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.noargs.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.noargs.ksh
index 77eeacc5f2..77eeacc5f2 100644
--- a/usr/src/cmd/mdb/test/typedef/err.noargs.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.noargs.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.nokeyword.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.nokeyword.ksh
index 9a5e1a1fcc..9a5e1a1fcc 100644
--- a/usr/src/cmd/mdb/test/typedef/err.nokeyword.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.nokeyword.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.nomodel.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.nomodel.ksh
index 4614ac23d6..4614ac23d6 100644
--- a/usr/src/cmd/mdb/test/typedef/err.nomodel.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.nomodel.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.noname.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.noname.ksh
index 04ebca1204..04ebca1204 100644
--- a/usr/src/cmd/mdb/test/typedef/err.noname.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.noname.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/err.typeexists.ksh b/usr/src/test/util-tests/tests/mdb/typedef/err.typeexists.ksh
index a1158cd830..a1158cd830 100644
--- a/usr/src/cmd/mdb/test/typedef/err.typeexists.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/err.typeexists.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/tst.anonstruct.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb
index 27de9428c6..27de9428c6 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.anonstruct.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.anonstruct.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out
index 605e0facfc..605e0facfc 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.anonstruct.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonstruct.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.anonunion.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb
index 1aa17b5366..1aa17b5366 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.anonunion.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.anonunion.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out
index 0a762dc1f8..0a762dc1f8 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.anonunion.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.anonunion.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.cleanupstruct.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh
index fabc7dfb57..fabc7dfb57 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.cleanupstruct.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.cleanupstruct.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/tst.deftypes32.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb
index 12c28075a8..12c28075a8 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.deftypes32.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.deftypes32.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out
index 792f42fbf2..792f42fbf2 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.deftypes32.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes32.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.deftypes64.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb
index 5ae94cdea0..5ae94cdea0 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.deftypes64.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.deftypes64.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out
index 83b85b943a..83b85b943a 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.deftypes64.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.deftypes64.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.dellist.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb
index e9009d7b68..e9009d7b68 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.dellist.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.dellist.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb.out
index e69de29bb2..e69de29bb2 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.dellist.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.dellist.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.emptylist.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb
index 6c7505ac1c..6c7505ac1c 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.emptylist.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.emptylist.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb.out
index e69de29bb2..e69de29bb2 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.emptylist.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.emptylist.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.libctype.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh
index cf517cf937..cf517cf937 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.libctype.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/tst.libctype.ksh.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh.out
index d37ffafbfb..d37ffafbfb 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.libctype.ksh.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.libctype.ksh.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.models.ksh b/usr/src/test/util-tests/tests/mdb/typedef/tst.models.ksh
index 8537ec443c..8537ec443c 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.models.ksh
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.models.ksh
diff --git a/usr/src/cmd/mdb/test/typedef/tst.struct.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb
index 2e0206e7ec..2e0206e7ec 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.struct.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.struct.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb.out
index 9a7d801742..9a7d801742 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.struct.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.struct.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.structselfref.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb
index 85b3068e00..85b3068e00 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.structselfref.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.structselfref.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out
index a6f4823ad1..a6f4823ad1 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.structselfref.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structselfref.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.structvla.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb
index 27cd56c186..27cd56c186 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.structvla.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.structvla.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb.out
index 0a0d3d4029..0a0d3d4029 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.structvla.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.structvla.mdb.out
diff --git a/usr/src/cmd/mdb/test/typedef/tst.union.mdb b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb
index 966446caee..966446caee 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.union.mdb
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb
diff --git a/usr/src/cmd/mdb/test/typedef/tst.union.mdb.out b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb.out
index 2afc2eabb9..2afc2eabb9 100644
--- a/usr/src/cmd/mdb/test/typedef/tst.union.mdb.out
+++ b/usr/src/test/util-tests/tests/mdb/typedef/tst.union.mdb.out
diff --git a/usr/src/tools/findunref/exception_list.open b/usr/src/tools/findunref/exception_list.open
index 6c432c78c1..ae18a9c8ac 100644
--- a/usr/src/tools/findunref/exception_list.open
+++ b/usr/src/tools/findunref/exception_list.open
@@ -23,6 +23,7 @@
 #
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright 2020 Joyent, Inc.
 #
 #
 # open-tree exception list
@@ -239,4 +240,3 @@
 # ld tests which are not currently delivered
 #
 ./usr/src/cmd/sgs/test
-./usr/src/cmd/mdb/test