cleanup
6375 Add native name demangling support

@@ -12,10 +12,11 @@
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2017 Joyent, Inc.
+# Copyright 2017 Jason King.
 #
 
 set name=pkg.fmri value=pkg:/system/test/utiltest@$(PKGVERS)
 set name=pkg.description value="Miscellaneous Utility Unit Tests"
 set name=pkg.summary value="Utility Unit Test Suite"

@@ -24,10 +25,11 @@
 set name=variant.arch value=$(ARCH)
 dir path=opt/util-tests
 dir path=opt/util-tests/bin
 dir path=opt/util-tests/runfiles
 dir path=opt/util-tests/tests
+dir path=opt/util-tests/tests/demangle
 dir path=opt/util-tests/tests/dis
 dir path=opt/util-tests/tests/dis/i386
 dir path=opt/util-tests/tests/dis/sparc
 dir path=opt/util-tests/tests/files
 dir path=opt/util-tests/tests/libnvpair_json

@@ -36,10 +38,13 @@
 file path=opt/util-tests/bin/print_json mode=0555
 file path=opt/util-tests/bin/utiltest mode=0555
 file path=opt/util-tests/runfiles/default.run mode=0444
 file path=opt/util-tests/tests/allowed-ips mode=0555
 file path=opt/util-tests/tests/date_test mode=0555
+file path=opt/util-tests/tests/demangle/afl-fast mode=0555
+file path=opt/util-tests/tests/demangle/gcc-libstdc++ mode=0555
+file path=opt/util-tests/tests/demangle/llvm-stdcxxabi mode=0555
 file path=opt/util-tests/tests/dis/distest mode=0555
 file path=opt/util-tests/tests/dis/i386/32.adx.out mode=0555
 file path=opt/util-tests/tests/dis/i386/32.adx.s mode=0555
 file path=opt/util-tests/tests/dis/i386/32.aes.out mode=0555
 file path=opt/util-tests/tests/dis/i386/32.aes.s mode=0555

@@ -276,7 +281,9 @@
 file path=opt/util-tests/tests/libsff/libsff_wave.out mode=0444
 file path=opt/util-tests/tests/printf_test mode=0555
 file path=opt/util-tests/tests/set-linkprop mode=0555
 file path=opt/util-tests/tests/xargs_test mode=0555
 license lic_CDDL license=lic_CDDL
+license usr/src/lib/libdemangle/THIRDPARTYLICENSE \
+    license=usr/src/lib/libdemangle/THIRDPARTYLICENSE
 depend fmri=system/library/iconv/utf-8 type=require
 depend fmri=system/test/testrunner type=require