Print this page
Commonize demangle test pieces; allow for running specific tests and test cases; use linker sets to simplify test definition

@@ -11,13 +11,12 @@
 
 #
 # 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 2019, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
 # Copyright 2017 Jason King.
-# Copyright 2018, Joyent, Inc.
 #
 
 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"

@@ -1139,13 +1138,11 @@
 file path=opt/util-tests/tests/ctf/test-qualifiers.c mode=0555
 file path=opt/util-tests/tests/ctf/test-reference.c mode=0555
 file path=opt/util-tests/tests/ctf/test-sou.c mode=0555
 file path=opt/util-tests/tests/ctf/test-weak.c 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/demangle/cxx mode=0555
 file path=opt/util-tests/tests/demangle/rust mode=0555
 file path=opt/util-tests/tests/dis/distest mode=0555
 file path=opt/util-tests/tests/dis/i386/32.adx.out mode=0444
 file path=opt/util-tests/tests/dis/i386/32.adx.s mode=0444
 file path=opt/util-tests/tests/dis/i386/32.aes.out mode=0444

@@ -1453,11 +1450,11 @@
 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/smbios 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
+license usr/src/test/util-tests/tests/demangle/THIRDPARTYLICENSE.llvm \
+    license=usr/src/test/util-tests/tests/demangle/THIRDPARTYLICENSE.llvm
 license usr/src/test/util-tests/tests/demangle/THIRDPARTYLICENSE.rust \
     license=usr/src/test/util-tests/tests/demangle/THIRDPARTYLICENSE.rust
 depend fmri=system/library/iconv/utf-8 type=require
 depend fmri=system/test/testrunner type=require