2755 split ksh93 from core package

13460 ksh93 tests should be moved out of usr/demo
518 ksh documentation should be moved out of SUNWcsr
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>

12 files changed, 488 insertions, 375 deletions

diff --git a/exception_lists/packaging b/exception_lists/packaging
index b17404fecb..74f3b508a0 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -29,7 +29,7 @@
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2018 Jason King
 # Copyright 2019, Joyent, Inc.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2020 Peter Tribble
 #
 
@@ -452,6 +452,10 @@ usr/lib/sparcv9/libdll.so		sparc
 # libpp (a helper library needed by AST's msgcc)
 usr/lib/libpp.so
 usr/lib/locale/C/LC_MESSAGES/libpp
+# libcmd
+usr/lib/libcmd.so
+usr/lib/amd64/libcmd.so			i386
+usr/lib/sparcv9/libcmd.so		sparc
 # libshell
 usr/lib/libshell.so
 usr/lib/amd64/libshell.so		i386
diff --git a/usr/src/cmd/ast/libshell/Makefile b/usr/src/cmd/ast/libshell/Makefile
index 817297a67b..73bbad600c 100644
--- a/usr/src/cmd/ast/libshell/Makefile
+++ b/usr/src/cmd/ast/libshell/Makefile
@@ -61,6 +61,7 @@ $(SUBDIRS):	FRC
 FRC:
 
 ASTSRC= $(CONTRIB)/ast/src/cmd/ksh93
+include Makefile.tests
 include Makefile.demo
 include Makefile.doc
 
diff --git a/usr/src/cmd/ast/libshell/Makefile.demo b/usr/src/cmd/ast/libshell/Makefile.demo
index ebddf0e6cc..594ab8b11e 100644
--- a/usr/src/cmd/ast/libshell/Makefile.demo
+++ b/usr/src/cmd/ast/libshell/Makefile.demo
@@ -60,111 +60,9 @@ DF_FUN= \
 	fun/popd \
 	fun/pushd
 
-DF_TESTS= \
-	tests/shtests \
-	tests/alias.sh \
-	tests/append.sh \
-	tests/arith.sh \
-	tests/arrays.sh \
-	tests/arrays2.sh \
-	tests/attributes.sh \
-	tests/basic.sh \
-	tests/bracket.sh \
-	tests/builtins.sh \
-	tests/case.sh \
-	tests/comvar.sh \
-	tests/comvario.sh \
-	tests/coprocess.sh \
-	tests/cubetype.sh \
-	tests/enum.sh \
-	tests/exit.sh \
-	tests/expand.sh \
-	tests/functions.sh \
-	tests/glob.sh \
-	tests/grep.sh \
-	tests/heredoc.sh \
-	tests/io.sh \
-	tests/leaks.sh \
-	tests/locale.sh \
-	tests/math.sh \
-	tests/nameref.sh \
-	tests/namespace.sh \
-	tests/options.sh \
-	tests/path.sh \
-	tests/pointtype.sh \
-	tests/pty.sh \
-	tests/quoting.sh \
-	tests/quoting2.sh \
-	tests/readcsv.sh \
-	tests/recttype.sh \
-	tests/restricted.sh \
-	tests/return.sh \
-	tests/select.sh \
-	tests/sigchld.sh \
-	tests/signal.sh \
-	tests/statics.sh \
-	tests/subshell.sh \
-	tests/substring.sh \
-	tests/tilde.sh \
-	tests/timetype.sh \
-	tests/treemove.sh \
-	tests/types.sh \
-	tests/variables.sh \
-	tests/vartree1.sh \
-	tests/vartree2.sh
-
-
-DF_XTESTS= \
-	tests/README.tests \
-	tests/illumos_4149_builtin_head.sh \
-	tests/illumos_13434_chunked_heredoc.sh \
-	tests/sun_solaris_array_default_datatype.sh \
-	tests/sun_solaris_builtin_poll.sh \
-	tests/sun_solaris_builtin_sum.sh \
-	tests/sun_solaris_builtin_tail.sh \
-	tests/sun_solaris_command_substitution.sh \
-	tests/sun_solaris_compound_misc.sh \
-	tests/sun_solaris_compound_nameref.sh \
-	tests/sun_solaris_compoundvario.sh \
-	tests/sun_solaris_cr_xxxxxxxx_template.sh \
-	tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh \
-	tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh \
-	tests/sun_solaris_cr_6722134_background_CHLD_trap.sh \
-	tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh \
-	tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh \
-	tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh \
-	tests/sun_solaris_cr_6766246_pattern_matching_bug.sh \
-	tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh \
-	tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh \
-	tests/sun_solaris_cr_6778077_sigthaw_trap.sh \
-	tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh \
-	tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh \
-	tests/sun_solaris_cr_6805792_varmovetest1.sh \
-	tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh \
-	tests/sun_solaris_cr_6805795_negative_zero.sh \
-	tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh \
-	tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh \
-	tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh \
-	tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh \
-	tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh \
-	tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh \
-	tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh \
-	tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh \
-	tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh \
-	tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh \
-	tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh \
-	tests/sun_solaris_getconf.sh \
-	tests/sun_solaris_locale_misc.sh \
-	tests/sun_solaris_local_compound_nameref001.sh \
-	tests/sun_solaris_staticvariables.sh \
-	tests/sun_solaris_vartree001.sh \
-	tests/sun_solaris_vartree002.sh \
-	tests/sun_solaris_vartree003.sh
-
-DEMOFILES= $(DF_SRC) $(DF_BIN) $(DF_FUN) $(DF_TESTS) $(DF_XTESTS)
+DEMOFILES= $(DF_SRC) $(DF_BIN) $(DF_FUN)
 
 # Rules for executables
-$(ROOTDEMODIRBASE)/tests/shtests := FILEMODE= 755
 $(ROOTDEMODIRBASE)/fun/%	 := FILEMODE= 755
 $(ROOTDEMODIRBASE)/bin/%	 := FILEMODE= 755
 
@@ -176,14 +74,10 @@ $(ROOTDEMODIRBASE)/bin/%: common/scripts/%.sh
 $(ROOTDEMODIRBASE)/src/%.sh: common/scripts/%.sh
 	$(INS.file)
 
-$(ROOTDEMODIRBASE)/tests/%: common/tests/%
-	$(INS.file)
-
 ROOTDEMODIRS=	$(ROOTDEMODIRBASE) .WAIT \
 		$(ROOTDEMODIRBASE)/bin \
 		$(ROOTDEMODIRBASE)/fun \
-		$(ROOTDEMODIRBASE)/src \
-		$(ROOTDEMODIRBASE)/tests
+		$(ROOTDEMODIRBASE)/src
 
 _demoinstall: $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES)
 install: _demoinstall
diff --git a/usr/src/cmd/ast/libshell/Makefile.tests b/usr/src/cmd/ast/libshell/Makefile.tests
new file mode 100644
index 0000000000..6077a28c23
--- /dev/null
+++ b/usr/src/cmd/ast/libshell/Makefile.tests
@@ -0,0 +1,159 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+#
+# These are tests that come from usr/src/contrib/ast, and the test driver
+# itself.
+#
+DF_TESTS= \
+	shtests \
+	tests/alias.sh \
+	tests/append.sh \
+	tests/arith.sh \
+	tests/arrays.sh \
+	tests/arrays2.sh \
+	tests/attributes.sh \
+	tests/basic.sh \
+	tests/bracket.sh \
+	tests/builtins.sh \
+	tests/case.sh \
+	tests/comvar.sh \
+	tests/comvario.sh \
+	tests/coprocess.sh \
+	tests/cubetype.sh \
+	tests/enum.sh \
+	tests/exit.sh \
+	tests/expand.sh \
+	tests/functions.sh \
+	tests/glob.sh \
+	tests/grep.sh \
+	tests/heredoc.sh \
+	tests/io.sh \
+	tests/leaks.sh \
+	tests/locale.sh \
+	tests/math.sh \
+	tests/nameref.sh \
+	tests/namespace.sh \
+	tests/options.sh \
+	tests/path.sh \
+	tests/pointtype.sh \
+	tests/pty.sh \
+	tests/quoting.sh \
+	tests/quoting2.sh \
+	tests/readcsv.sh \
+	tests/recttype.sh \
+	tests/restricted.sh \
+	tests/return.sh \
+	tests/select.sh \
+	tests/sigchld.sh \
+	tests/signal.sh \
+	tests/statics.sh \
+	tests/subshell.sh \
+	tests/substring.sh \
+	tests/tilde.sh \
+	tests/timetype.sh \
+	tests/treemove.sh \
+	tests/types.sh \
+	tests/variables.sh \
+	tests/vartree1.sh \
+	tests/vartree2.sh
+
+#
+# These are additional illumos tests and the README
+#
+
+DF_XTESTS= \
+	README.tests \
+	tests/illumos_13434_chunked_heredoc.sh \
+	tests/illumos_4149_builtin_head.sh \
+	tests/sun_solaris_array_default_datatype.sh \
+	tests/sun_solaris_builtin_poll.sh \
+	tests/sun_solaris_builtin_sum.sh \
+	tests/sun_solaris_builtin_tail.sh \
+	tests/sun_solaris_command_substitution.sh \
+	tests/sun_solaris_compound_misc.sh \
+	tests/sun_solaris_compound_nameref.sh \
+	tests/sun_solaris_compoundvario.sh \
+	tests/sun_solaris_cr_xxxxxxxx_template.sh \
+	tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh \
+	tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh \
+	tests/sun_solaris_cr_6722134_background_CHLD_trap.sh \
+	tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh \
+	tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh \
+	tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh \
+	tests/sun_solaris_cr_6766246_pattern_matching_bug.sh \
+	tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh \
+	tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh \
+	tests/sun_solaris_cr_6778077_sigthaw_trap.sh \
+	tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh \
+	tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh \
+	tests/sun_solaris_cr_6805792_varmovetest1.sh \
+	tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh \
+	tests/sun_solaris_cr_6805795_negative_zero.sh \
+	tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh \
+	tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh \
+	tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh \
+	tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh \
+	tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh \
+	tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh \
+	tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh \
+	tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh \
+	tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh \
+	tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh \
+	tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh \
+	tests/sun_solaris_getconf.sh \
+	tests/sun_solaris_locale_misc.sh \
+	tests/sun_solaris_local_compound_nameref001.sh \
+	tests/sun_solaris_staticvariables.sh \
+	tests/sun_solaris_vartree001.sh \
+	tests/sun_solaris_vartree002.sh \
+	tests/sun_solaris_vartree003.sh
+
+TESTFILES= $(DF_TESTS) $(DF_XTESTS)
+
+TESTFILESRCDIR=		$(ASTSRC)
+ROOTTESTDIRBASE=	$(ROOT)/opt/ksh93-tests
+
+# Rules for executables
+$(ROOTTESTDIRBASE)/shtests := FILEMODE= 755
+
+$(ROOTTESTDIRBASE)/% $(ROOTTESTDIRBASE)/tests/%: common/tests/%
+	$(INS.file)
+
+$(ROOTTESTDIRBASE)/%: $(TESTFILESRCDIR)/%
+	$(INS.file)
+
+$(ROOTTESTDIRBASE)/%: $(TESTFILESRCDIR)/tests/%
+	$(INS.file)
+
+$(ROOTTESTDIRBASE) $(ROOTTESTDIRBASE)/tests:
+	$(INS.dir)
+
+ROOTTESTDIRS= $(ROOTTESTDIRBASE) .WAIT $(ROOTTESTDIRBASE)/tests
+ROOTTESTFILES= $(TESTFILES:%=$(ROOTTESTDIRBASE)/%)
+
+_testinstall: $(ROOTTESTDIRS) .WAIT $(ROOTTESTFILES)
+install: _testinstall
diff --git a/usr/src/cmd/ast/libshell/common/tests/README.tests b/usr/src/cmd/ast/libshell/common/tests/README.tests
index 91a83d4394..84969cebec 100644
--- a/usr/src/cmd/ast/libshell/common/tests/README.tests
+++ b/usr/src/cmd/ast/libshell/common/tests/README.tests
@@ -3,7 +3,7 @@
 
 ## Introduction
 
-The directory /usr/demo/ksh/tests/ contains the ksh93 test suite
+The directory /opt/ksh93-tests/ contains the ksh93 test suite
 which is used to verify the correct behaviour of ksh93.
 
 The test suite is split into modules with the ending *.sh
@@ -11,7 +11,7 @@ and a frontend called "shtests" which is used to run the tests.
 
 ## Basic description:
 
-/usr/demo/ksh/tests/shtests <options> <varname=value> <testmodule>
+/opt/ksh93-tests/shtests <options> <varname=value> <testmodule>
 
 By default, with no <options>, each test is run three times:
 
@@ -35,8 +35,8 @@ By default, with no <options>, each test is run three times:
 The tests can be executed like this:
 $ export SHELL=<path-to-ksh93-executable>
 $ export SHCOMP=/usr/bin/shcomp
-for t in /usr/demo/ksh/tests/*.sh ; do
-    $SHELL /usr/demo/ksh/tests/shtests "$t"
+for t in /opt/ksh93-tests/tests/*.sh; do
+    $SHELL /opt/ksh93-tests/shtests "$t"
 done
 
 Note that you MUST NOT use "/usr/bin/ksh93" as value for
diff --git a/usr/src/cmd/tail/tests/sun_solaris_tail.sh b/usr/src/cmd/tail/tests/sun_solaris_tail.sh
index b78e487d26..6f329c1ae2 100755
--- a/usr/src/cmd/tail/tests/sun_solaris_tail.sh
+++ b/usr/src/cmd/tail/tests/sun_solaris_tail.sh
@@ -26,7 +26,7 @@
 
 #
 # Additional tests borrowed from ksh93 builtin tail test script
-# (usr/src/lib/libshell/common/tests/sun_solaris_builtin_tail).  Modified
+# (usr/src/cmd/ast/libshell/common/tests/sun_solaris_builtin_tail).  Modified
 # to use /usr/bin/tail rather than the ksh93 builtin.
 #
 TAIL=/usr/bin/tail
@@ -73,12 +73,12 @@ function waitpidtimeout
 	float -r STEP=0.5 # const
 
 	(( timeout=timeout/STEP ))
-	
+
 	for (( i=0 ; i < timeout ; i+=STEP )) ; do
 		isvalidpid ${pid} || break
 		sleep ${STEP}
 	done
-	
+
 	return 0
 }
 
@@ -110,7 +110,7 @@ function myintseq
 			return 1
                         ;;
         esac
-        
+
         return 0
 }
 
@@ -168,7 +168,7 @@ compound -a testcases=(
 		input=$'1\n2\n3\n4'
 		compound -A tail_args=(
 			[legacy]=(   argv=( "-0"	 ) )
-#			[std_like]=( argv=( "-n" "0" ) ) 
+#			[std_like]=( argv=( "-n" "0" ) )
 		)
 		expected_output=$''
 	)
@@ -311,22 +311,22 @@ for testid in "${!testcases[@]}" ; do
 	for argv_variants in "${!tc.tail_args[@]}" ; do
 		nameref argv=tc.tail_args[${argv_variants}].argv
 		output=$(
-				set -o pipefail
-	          		(trap "" PIPE ; print -r -- "${tc.input}") | $TAIL "${argv[@]}"
+			set -o pipefail
+			(trap "" PIPE ; print -r -- "${tc.input}") | $TAIL "${argv[@]}"
 			) || err_exit "test ${tc.name}/${argv_variants}: command failed with exit code $?"
-	
+
 		[[ "${output}" == "${tc.expected_output}" ]] || err_exit "test ${tc.name}/${argv_variants}: Expected $(doublebackslashquote "${tc.expected_output}"), got $(doublebackslashquote "${output}")"
 	done
 done
 
 
 # test2: test "tail -r </etc/profile | rev -l" vs. "cat </etc/profile"
-[[ "$($TAIL -r </etc/profile | rev -l)" == "$( cat /etc/profile )" ]] || err_exit "'tail -r </etc/profile | rev -l' output does not match 'cat /etc/profile'" 
+[[ "$($TAIL -r </etc/profile | rev -l)" == "$( cat /etc/profile )" ]] || err_exit "'tail -r </etc/profile | rev -l' output does not match 'cat /etc/profile'"
 
 # Test case not applicable to FreeBSD 'tail'
 # test 3: ast-ksh.2009-05-05 "tail" builtin may crash if we pass unsupported long options
 #$SHELL -o errexit -c 'builtin tail ; print "hello" | tail --attack_of_chicken_monsters' >/dev/null 2>&1
-#(( $? == 2 )) || err_exit "expected exit code 2 for unsupported long option, got $?" 
+#(( $? == 2 )) || err_exit "expected exit code 2 for unsupported long option, got $?"
 
 
 # test 4: FIFO tests
@@ -338,7 +338,7 @@ function test_tail_fifo_1
 	typeset tail_cmd="$1"
 	integer i
 	integer tail_pid=-1
-	
+
 	# cleanup trap
 	trap "rm -f tailtestfifo tailout" EXIT
 
@@ -358,7 +358,7 @@ function test_tail_fifo_1
 	fi
 
 	wait || err_exit "tail child returned non-zero exit code=$?"
-	
+
 	[[ "$(cat tailout)" == $'11\n12\n13\n14\n15\n16\n17\n18\n19\n20' ]] || err_exit "test_tail_fifo_1: Expected $(doublebackslashquote '11\n12\n13\n14\n15\n16\n17\n18\n19\n20'), got $(doublebackslashquote "$(cat tailout)")"
 
 	return 0
@@ -369,7 +369,7 @@ function test_tail_fifo_2
 	typeset tail_cmd="$1"
 	integer i
 	integer tail_pid=-1
-	
+
 	# cleanup trap
 	trap "rm -f tailtestfifo tailout" EXIT
 
@@ -398,7 +398,7 @@ function test_tail_fifo_2
 	fi
 
 	wait || err_exit "tail child returned non-zero exit code=$?"
-	
+
 	[[ "$(cat tailout)" == $'5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15' ]] || err_exit "test_tail_fifo_2: Expected $(doublebackslashquote $'5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15'), got $(doublebackslashquote "$(cat tailout)")"
 
 	return 0
@@ -426,7 +426,7 @@ function followtest1
 	if ${usenewline} ; then
 		newline=$'\n'
 	fi
-	
+
 	rm -f "${FOLLOWFILE}" "${OUTFILE}"
 	print -n "${newline}" > "${FOLLOWFILE}"
 
@@ -444,14 +444,14 @@ function followtest1
 	kill -KILL ${tailchild} 2>/dev/null
 	#kill -TERM ${tailchild} 2>/dev/null
 	waitpidtimeout ${tailchild} 5
-	
+
 	if isvalidpid ${tailchild} ; then
 		err_exit "${title}: tail pid=${tailchild} hung."
 		kill -KILL ${tailchild} 2>/dev/null
 	fi
-	
+
 	wait ${tailchild} 2>/dev/null
-	
+
 	rm -f "${FOLLOWFILE}" "${OUTFILE}"
 
 	return 0
@@ -482,24 +482,24 @@ function followtest2
 
 	${testcmd} -n 60000 -f "${FOLLOWFILE}" >"${OUTFILE}" &
 	(( tailchild=$! ))
-	
+
 	sleep 10
 
 	kill -KILL ${tailchild} 2>/dev/null
 	#kill -TERM ${tailchild} 2>/dev/null
 	waitpidtimeout ${tailchild} 5
-	
+
 	if isvalidpid ${tailchild} ; then
 		err_exit "${title}: tail pid=${tailchild} hung."
 		kill -KILL ${tailchild} 2>/dev/null
 	fi
-	
+
 	wait ${tailchild} 2>/dev/null
-		
+
 	# this tail should be an external process
 	outstr=$(/usr/bin/tail "${OUTFILE}") || err_exit "tail returned non-zero exit code $?"
-        [[ "${outstr}" == 49991*50000 ]] || err_exit "${title}: Expected match for 49991*50000, got "$(singlebackslashquote "${outstr}")""	
-	
+        [[ "${outstr}" == 49991*50000 ]] || err_exit "${title}: Expected match for 49991*50000, got "$(singlebackslashquote "${outstr}")""
+
 	rm -f "${FOLLOWFILE}" "${OUTFILE}"
 
 	return 0
diff --git a/usr/src/pkg/manifests/SUNWcs.man1.inc b/usr/src/pkg/manifests/SUNWcs.man1.inc
index 381f383b88..023b7e6153 100644
--- a/usr/src/pkg/manifests/SUNWcs.man1.inc
+++ b/usr/src/pkg/manifests/SUNWcs.man1.inc
@@ -12,6 +12,7 @@
 #
 # Copyright 2011, Richard Lowe
 # Copyright 2018 Nexenta Systems, Inc.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 file path=usr/share/man/man1/Intro.1
@@ -39,14 +40,10 @@ file path=usr/share/man/man1/ckkeywd.1
 file path=usr/share/man/man1/ckpath.1
 file path=usr/share/man/man1/ckrange.1
 file path=usr/share/man/man1/ckstr.1
-file path=usr/share/man/man1/cksum.1
 file path=usr/share/man/man1/cktime.1
 file path=usr/share/man/man1/ckuid.1
 file path=usr/share/man/man1/ckyorn.1
 file path=usr/share/man/man1/clear.1
-file path=usr/share/man/man1/cmp.1
-file path=usr/share/man/man1/comm.1
-file path=usr/share/man/man1/command.1
 file path=usr/share/man/man1/cp.1
 file path=usr/share/man/man1/cpio.1
 file path=usr/share/man/man1/crle.1
@@ -56,7 +53,6 @@ file path=usr/share/man/man1/csh.1
 file path=usr/share/man/man1/ctrun.1
 file path=usr/share/man/man1/ctstat.1
 file path=usr/share/man/man1/ctwatch.1
-file path=usr/share/man/man1/cut.1
 file path=usr/share/man/man1/date.1
 file path=usr/share/man/man1/deallocate.1
 file path=usr/share/man/man1/dhcpinfo.1
@@ -85,7 +81,6 @@ file path=usr/share/man/man1/getconf.1
 file path=usr/share/man/man1/getfacl.1
 file path=usr/share/man/man1/getopt.1
 file path=usr/share/man/man1/getoptcvt.1
-file path=usr/share/man/man1/getopts.1
 file path=usr/share/man/man1/gettext.1
 file path=usr/share/man/man1/glob.1
 file path=usr/share/man/man1/grep.1
@@ -99,13 +94,10 @@ file path=usr/share/man/man1/iconv.1
 file path=usr/share/man/man1/isainfo.1
 file path=usr/share/man/man1/isalist.1
 file path=usr/share/man/man1/jobs.1
-file path=usr/share/man/man1/join.1
 file path=usr/share/man/man1/kbd.1
 file path=usr/share/man/man1/keylogin.1
 file path=usr/share/man/man1/keylogout.1
-file path=usr/share/man/man1/kill.1
 file path=usr/share/man/man1/kmfcfg.1
-file path=usr/share/man/man1/ksh93.1
 file path=usr/share/man/man1/kvmstat.1
 file path=usr/share/man/man1/ld.so.1.1
 file path=usr/share/man/man1/let.1
@@ -141,7 +133,6 @@ file path=usr/share/man/man1/nohup.1
 file path=usr/share/man/man1/optisa.1
 file path=usr/share/man/man1/pagesize.1
 file path=usr/share/man/man1/passwd.1
-file path=usr/share/man/man1/paste.1
 file path=usr/share/man/man1/pathchk.1
 file path=usr/share/man/man1/pax.1
 file path=usr/share/man/man1/pfexec.1
@@ -150,7 +141,6 @@ file path=usr/share/man/man1/pgrep.1
 file path=usr/share/man/man1/pktool.1
 file path=usr/share/man/man1/pr.1
 file path=usr/share/man/man1/prctl.1
-file path=usr/share/man/man1/print.1
 file path=usr/share/man/man1/priocntl.1
 file path=usr/share/man/man1/proc.1
 file path=usr/share/man/man1/profiles.1
@@ -160,7 +150,6 @@ file path=usr/share/man/man1/pwd.1
 file path=usr/share/man/man1/read.1
 file path=usr/share/man/man1/readonly.1
 file path=usr/share/man/man1/renice.1
-file path=usr/share/man/man1/rev.1
 file path=usr/share/man/man1/rm.1
 file path=usr/share/man/man1/roles.1
 file path=usr/share/man/man1/runat.1
@@ -169,21 +158,17 @@ file path=usr/share/man/man1/sed.1
 file path=usr/share/man/man1/set.1
 file path=usr/share/man/man1/setfacl.1
 file path=usr/share/man/man1/setpgrp.1
-file path=usr/share/man/man1/shcomp.1
 file path=usr/share/man/man1/shell_builtins.1
 file path=usr/share/man/man1/shift.1
 file path=usr/share/man/man1/sleep.1
 file path=usr/share/man/man1/strchg.1
 file path=usr/share/man/man1/stty.1
-file path=usr/share/man/man1/sum.1
 file path=usr/share/man/man1/suspend.1
 file path=usr/share/man/man1/svcprop.1
 file path=usr/share/man/man1/svcs.1
 file path=usr/share/man/man1/tabs.1
 file path=usr/share/man/man1/tail.1
 file path=usr/share/man/man1/tar.1
-file path=usr/share/man/man1/tee.1
-file path=usr/share/man/man1/test.1
 file path=usr/share/man/man1/time.1
 file path=usr/share/man/man1/times.1
 file path=usr/share/man/man1/tip.1
@@ -193,17 +178,12 @@ file path=usr/share/man/man1/tr.1
 file path=usr/share/man/man1/trap.1
 file path=usr/share/man/man1/true.1
 file path=usr/share/man/man1/tty.1
-file path=usr/share/man/man1/type.1
 file path=usr/share/man/man1/typeset.1
-file path=usr/share/man/man1/umask.1
 file path=usr/share/man/man1/uname.1
-file path=usr/share/man/man1/uniq.1
 file path=usr/share/man/man1/uptime.1
 file path=usr/share/man/man1/uuidgen.1
 file path=usr/share/man/man1/vtfontcvt.1
 file path=usr/share/man/man1/w.1
-file path=usr/share/man/man1/wait.1
-file path=usr/share/man/man1/wc.1
 file path=usr/share/man/man1/which.1
 file path=usr/share/man/man1/who.1
 file path=usr/share/man/man1/write.1
@@ -255,8 +235,6 @@ link path=usr/share/man/man1/helpyorn.1 target=ckyorn.1
 link path=usr/share/man/man1/hist.1 target=history.1
 link path=usr/share/man/man1/if.1 target=shell_builtins.1
 link path=usr/share/man/man1/intro.1 target=Intro.1
-link path=usr/share/man/man1/jsh.1 target=ksh93.1
-link path=usr/share/man/man1/ksh.1 target=ksh93.1
 link path=usr/share/man/man1/notify.1 target=jobs.1
 link path=usr/share/man/man1/onintr.1 target=trap.1
 link path=usr/share/man/man1/page.1 target=more.1
@@ -281,14 +259,11 @@ link path=usr/share/man/man1/red.1 target=ed.1
 link path=usr/share/man/man1/rehash.1 target=hash.1
 link path=usr/share/man/man1/repeat.1 target=shell_builtins.1
 link path=usr/share/man/man1/return.1 target=exit.1
-link path=usr/share/man/man1/rksh.1 target=ksh93.1
-link path=usr/share/man/man1/rksh93.1 target=ksh93.1
 link path=usr/share/man/man1/rmail.1 target=mail.1
 link path=usr/share/man/man1/rmdir.1 target=rm.1
 link path=usr/share/man/man1/select.1 target=shell_builtins.1
 link path=usr/share/man/man1/setenv.1 target=set.1
 link path=usr/share/man/man1/settime.1 target=touch.1
-link path=usr/share/man/man1/sh.1 target=ksh93.1
 link path=usr/share/man/man1/source.1 target=exec.1
 link path=usr/share/man/man1/stop.1 target=jobs.1
 link path=usr/share/man/man1/strconf.1 target=strchg.1
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 70a52d058e..7cd67ac2d4 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -251,9 +251,6 @@ $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
 dir path=usr/sbin/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/doc group=other
-dir path=usr/share/doc/ksh
-dir path=usr/share/doc/ksh/images
-dir path=usr/share/doc/ksh/images/callouts
 dir path=usr/share/lib
 dir path=usr/share/lib/mailx
 dir path=usr/share/lib/pub
@@ -388,7 +385,6 @@ file path=etc/init.d/README group=sys preserve=true
 file path=etc/init.d/sysetup group=sys mode=0744 preserve=true
 file path=etc/inittab group=sys preserve=true
 file path=etc/ioctl.syscon group=sys preserve=true
-file path=etc/ksh.kshrc group=sys preserve=renameold
 file path=etc/logadm.conf group=sys preserve=true timestamp=19700101T000000Z
 file path=etc/logindevperm group=sys preserve=true
 file path=etc/magic mode=0444
@@ -448,7 +444,6 @@ file path=etc/security/prof_attr group=sys preserve=true \
     timestamp=19700101T000000Z
 file path=etc/security/prof_attr.d/SUNWcs group=sys
 file path=etc/shadow group=sys mode=0400 preserve=true
-file path=etc/skel/.kshrc group=other preserve=true
 file path=etc/skel/.profile group=other preserve=true
 file path=etc/svc/profile/generic_limited_net.xml group=sys mode=0444
 file path=etc/svc/profile/generic_open.xml group=sys mode=0444
@@ -671,7 +666,6 @@ file path=sbin/zonename mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/amt mode=0555
 file path=usr/bin/$(ARCH32)/decrypt mode=0555
 file path=usr/bin/$(ARCH32)/digest mode=0555
-file path=usr/bin/$(ARCH32)/ksh93 mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/newtask group=sys mode=4555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/nohup mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/prctl mode=0555
@@ -684,7 +678,6 @@ file path=usr/bin/$(ARCH64)/amt mode=0555
 file path=usr/bin/$(ARCH64)/crle mode=0555
 file path=usr/bin/$(ARCH64)/decrypt mode=0555
 file path=usr/bin/$(ARCH64)/digest mode=0555
-file path=usr/bin/$(ARCH64)/ksh93 mode=0555
 file path=usr/bin/$(ARCH64)/ls mode=0555
 file path=usr/bin/$(ARCH64)/moe mode=0555
 file path=usr/bin/$(ARCH64)/newtask group=sys mode=4555
@@ -696,7 +689,6 @@ file path=usr/bin/$(ARCH64)/savecore mode=0555
 file path=usr/bin/$(ARCH64)/setuname mode=0555
 file path=usr/bin/$(ARCH64)/uptime mode=4555
 $(i386_ONLY)file path=usr/bin/addbadsec mode=0555
-file path=usr/bin/alias mode=0555
 file path=usr/bin/amt mode=0555
 file path=usr/bin/arch mode=0555
 file path=usr/bin/at group=sys mode=4755
@@ -836,7 +828,6 @@ file path=usr/bin/sed mode=0555
 file path=usr/bin/setfacl mode=0555
 file path=usr/bin/setpgrp group=sys mode=0555
 file path=usr/bin/settime mode=0555
-file path=usr/bin/shcomp mode=0555
 file path=usr/bin/sleep mode=0555
 file path=usr/bin/strchg group=root mode=0555
 file path=usr/bin/strconf group=root mode=0555
@@ -1384,30 +1375,6 @@ file path=usr/sbin/wall group=tty mode=2555
 file path=usr/sbin/whodo mode=4555
 file path=usr/sbin/zdump mode=0555
 file path=usr/sbin/zic mode=0555
-file path=usr/share/doc/ksh/COMPATIBILITY
-file path=usr/share/doc/ksh/DESIGN
-file path=usr/share/doc/ksh/OBSOLETE
-file path=usr/share/doc/ksh/README
-file path=usr/share/doc/ksh/RELEASE
-file path=usr/share/doc/ksh/TYPES
-file path=usr/share/doc/ksh/images/callouts/1.png
-file path=usr/share/doc/ksh/images/callouts/10.png
-file path=usr/share/doc/ksh/images/callouts/2.png
-file path=usr/share/doc/ksh/images/callouts/3.png
-file path=usr/share/doc/ksh/images/callouts/4.png
-file path=usr/share/doc/ksh/images/callouts/5.png
-file path=usr/share/doc/ksh/images/callouts/6.png
-file path=usr/share/doc/ksh/images/callouts/7.png
-file path=usr/share/doc/ksh/images/callouts/8.png
-file path=usr/share/doc/ksh/images/callouts/9.png
-file path=usr/share/doc/ksh/images/tag_bourne.png
-file path=usr/share/doc/ksh/images/tag_i18n.png
-file path=usr/share/doc/ksh/images/tag_ksh.png
-file path=usr/share/doc/ksh/images/tag_ksh88.png
-file path=usr/share/doc/ksh/images/tag_ksh93.png
-file path=usr/share/doc/ksh/images/tag_l10n.png
-file path=usr/share/doc/ksh/images/tag_perf.png
-file path=usr/share/doc/ksh/shell_styleguide.docbook
 file path=usr/share/lib/mailx/mailx.help
 file path=usr/share/lib/mailx/mailx.help.~
 file path=usr/share/lib/tabset/3101
@@ -1442,24 +1409,11 @@ $(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \
 hardlink path=sbin/rc5 target=../sbin/rc0
 hardlink path=sbin/rc6 target=../sbin/rc0
 hardlink path=usr/bin/$(ARCH32)/encrypt target=decrypt
-hardlink path=usr/bin/$(ARCH32)/ksh target=ksh93
 hardlink path=usr/bin/$(ARCH32)/mac target=digest
-hardlink path=usr/bin/$(ARCH32)/rksh target=ksh93
-hardlink path=usr/bin/$(ARCH32)/rksh93 target=ksh93
 $(i386_ONLY)hardlink path=usr/bin/$(ARCH32)/w target=uptime
 hardlink path=usr/bin/$(ARCH64)/encrypt target=decrypt
-hardlink path=usr/bin/$(ARCH64)/ksh target=ksh93
 hardlink path=usr/bin/$(ARCH64)/mac target=digest
-hardlink path=usr/bin/$(ARCH64)/rksh target=ksh93
-hardlink path=usr/bin/$(ARCH64)/rksh93 target=ksh93
 hardlink path=usr/bin/$(ARCH64)/w target=uptime
-hardlink path=usr/bin/bg target=../../usr/bin/alias
-hardlink path=usr/bin/cd target=../../usr/bin/alias
-hardlink path=usr/bin/cksum target=../../usr/bin/alias
-hardlink path=usr/bin/cmp target=../../usr/bin/alias
-hardlink path=usr/bin/comm target=../../usr/bin/alias
-hardlink path=usr/bin/command target=../../usr/bin/alias
-hardlink path=usr/bin/cut target=../../usr/bin/alias
 hardlink path=usr/bin/decrypt target=../../usr/lib/isaexec
 hardlink path=usr/bin/digest target=../../usr/lib/isaexec
 hardlink path=usr/bin/dispgid target=../../usr/bin/ckgid
@@ -1467,58 +1421,28 @@ hardlink path=usr/bin/dispuid target=../../usr/bin/ckuid
 hardlink path=usr/bin/edit target=../has/bin/edit
 hardlink path=usr/bin/egrep target=../../usr/bin/grep
 hardlink path=usr/bin/encrypt target=../../usr/lib/isaexec
-hardlink path=usr/bin/fc target=../../usr/bin/alias
-hardlink path=usr/bin/fg target=../../usr/bin/alias
 hardlink path=usr/bin/fgrep target=../../usr/bin/grep
-hardlink path=usr/bin/getopts target=../../usr/bin/alias
-hardlink path=usr/bin/hash target=../../usr/bin/alias
-hardlink path=usr/bin/jobs target=../../usr/bin/alias
-hardlink path=usr/bin/join target=../../usr/bin/alias
-hardlink path=usr/bin/kill target=../../usr/bin/alias
-hardlink path=usr/bin/ksh target=../../usr/lib/isaexec
-hardlink path=usr/bin/ksh93 target=../../usr/lib/isaexec
 hardlink path=usr/bin/ln target=../../usr/bin/cp
 hardlink path=usr/bin/mac target=../../usr/lib/isaexec
 hardlink path=usr/bin/mv target=../../usr/bin/cp
 hardlink path=usr/bin/newtask target=../../usr/lib/isaexec
 hardlink path=usr/bin/nohup target=../../usr/lib/isaexec
 hardlink path=usr/bin/page target=../../usr/bin/more
-hardlink path=usr/bin/paste target=../../usr/bin/alias
 hardlink path=usr/bin/pfbash target=../../usr/bin/pfexec
 hardlink path=usr/bin/pfcsh target=../../usr/bin/pfexec
-hardlink path=usr/bin/pfksh target=../../usr/bin/pfexec
-hardlink path=usr/bin/pfksh93 target=../../usr/bin/pfexec
-hardlink path=usr/bin/pfrksh target=../../usr/bin/pfexec
-hardlink path=usr/bin/pfrksh93 target=../../usr/bin/pfexec
-hardlink path=usr/bin/pfsh target=../../usr/bin/pfexec
 hardlink path=usr/bin/pftcsh target=../../usr/bin/pfexec
 hardlink path=usr/bin/pfzsh target=../../usr/bin/pfexec
 hardlink path=usr/bin/pkill target=../../usr/bin/pgrep
 hardlink path=usr/bin/prctl target=../../usr/lib/isaexec
-hardlink path=usr/bin/print target=../../usr/bin/alias
 hardlink path=usr/bin/prstat target=../../usr/lib/isaexec
 hardlink path=usr/bin/ps target=../../usr/lib/isaexec
-hardlink path=usr/bin/read target=../../usr/bin/alias
 hardlink path=usr/bin/red target=../../usr/bin/ed
-hardlink path=usr/bin/rev target=../../usr/bin/alias
-hardlink path=usr/bin/rksh target=../../usr/lib/isaexec
-hardlink path=usr/bin/rksh93 target=../../usr/lib/isaexec
 hardlink path=usr/bin/savecore target=../../usr/lib/isaexec
 hardlink path=usr/bin/setuname target=../../usr/lib/isaexec
-hardlink path=usr/bin/sum target=../../usr/bin/alias
-hardlink path=usr/bin/tee target=../../usr/bin/alias
-hardlink path=usr/bin/test target=../../usr/bin/alias
 hardlink path=usr/bin/touch target=../../usr/bin/settime
-hardlink path=usr/bin/type target=../../usr/bin/alias
-hardlink path=usr/bin/ulimit target=../../usr/bin/alias
-hardlink path=usr/bin/umask target=../../usr/bin/alias
-hardlink path=usr/bin/unalias target=../../usr/bin/alias
-hardlink path=usr/bin/uniq target=../../usr/bin/alias
 hardlink path=usr/bin/uptime target=../../usr/lib/isaexec
 hardlink path=usr/bin/vedit target=../has/bin/edit
 hardlink path=usr/bin/w target=../../usr/lib/isaexec
-hardlink path=usr/bin/wait target=../../usr/bin/alias
-hardlink path=usr/bin/wc target=../../usr/bin/alias
 hardlink path=usr/has/bin/ex target=edit
 hardlink path=usr/has/bin/pfsh target=../../bin/pfexec
 hardlink path=usr/has/bin/vedit target=edit
@@ -1632,7 +1556,6 @@ license usr/src/cmd/which/THIRDPARTYLICENSE \
 license usr/src/cmd/xstr/THIRDPARTYLICENSE \
     license=usr/src/cmd/xstr/THIRDPARTYLICENSE
 license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
-license usr/src/contrib/ast/LICENSE license=usr/src/contrib/ast/LICENSE
 link path=bin target=./usr/bin
 link path=etc/TIMEZONE target=./default/init
 link path=etc/autopush target=../sbin/autopush
@@ -1698,16 +1621,12 @@ link path=etc/wall target=../usr/sbin/wall
 link path=etc/whodo target=../usr/sbin/whodo
 link path=etc/wtmpx target=../var/adm/wtmpx
 link path=sbin/in.mpathd target=../lib/inet/in.mpathd
-link path=sbin/jsh target=../usr/bin/ksh93
 link path=sbin/pfsh target=../usr/bin/pfexec
-link path=sbin/sh target=../usr/bin/$(ARCH32)/ksh93
 link path=sbin/su target=../usr/bin/su
 link path=usr/adm target=../var/adm
 link path=usr/bin/df target=../sbin/df
-link path=usr/bin/jsh target=ksh93
 link path=usr/bin/pwconv target=../sbin/pwconv
 link path=usr/bin/rmail target=./mail
-link path=usr/bin/sh target=$(ARCH32)/ksh93
 link path=usr/bin/strclean target=../sbin/strclean
 link path=usr/bin/strerr target=../sbin/strerr
 link path=usr/bin/sync target=../../sbin/sync
@@ -1726,7 +1645,6 @@ link path=usr/lib/fs/ufs/mount target=../../../../etc/fs/ufs/mount
 link path=usr/lib/inet/in.mpathd target=../../../lib/inet/in.mpathd
 link path=usr/lib/ld.so.1 target=../../lib/ld.so.1
 link path=usr/lib/locale/POSIX target=./C
-link path=usr/lib/rsh target=../bin/ksh93
 link path=usr/lib/secure/32 target=.
 link path=usr/lib/secure/64 target=$(ARCH64)
 link path=usr/mail target=../var/mail
@@ -1796,6 +1714,9 @@ depend fmri=runtime/perl$(PERL_PKGVERS) type=require
 #
 depend fmri=runtime/perl$(PERL_PKGVERS)/module/sun-solaris type=require
 #
+# shell/ksh93 provides the system /bin/sh
+depend fmri=shell/ksh93 type=require
+#
 # The boot loader package
 #
 depend fmri=system/boot/loader type=require
diff --git a/usr/src/pkg/manifests/shell-ksh93.mf b/usr/src/pkg/manifests/shell-ksh93.mf
new file mode 100644
index 0000000000..073a1acbed
--- /dev/null
+++ b/usr/src/pkg/manifests/shell-ksh93.mf
@@ -0,0 +1,149 @@
+#
+# 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 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+# sh (AT&T Research) 93u+ 2012-08-01
+set name=pkg.fmri \
+    value=pkg:/shell/ksh93@93.21.1.20120801,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+set name=pkg.description value="ksh93 - the AT&T Korn Shell"
+set name=pkg.summary \
+    value="ksh - Shell, the standard command language interpreter"
+set name=info.classification value=org.opensolaris.category.2008:System/Shells
+set name=org.opensolaris.incorp-facet value=true
+dir path=sbin group=sys
+dir path=usr/bin
+dir path=usr/bin/$(ARCH32)
+dir path=usr/bin/$(ARCH64)
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/share/doc/ksh
+dir path=usr/share/doc/ksh/images
+dir path=usr/share/doc/ksh/images/callouts
+file path=etc/ksh.kshrc group=sys original_name=SUNWcs:etc/ksh.kshrc \
+    preserve=renameold
+file path=etc/skel/.kshrc group=other original_name=SUNWcs:etc/skel/.kshrc \
+    preserve=true
+file path=usr/bin/$(ARCH32)/ksh93 mode=0555
+file path=usr/bin/$(ARCH64)/ksh93 mode=0555
+file path=usr/bin/alias mode=0555
+file path=usr/bin/shcomp mode=0555
+file path=usr/lib/$(ARCH64)/libast.so.1
+file path=usr/lib/$(ARCH64)/libcmd.so.1
+file path=usr/lib/$(ARCH64)/libdll.so.1
+file path=usr/lib/$(ARCH64)/libshell.so.1
+file path=usr/lib/$(ARCH64)/libsum.so.1
+file path=usr/lib/libast.so.1
+file path=usr/lib/libcmd.so.1
+file path=usr/lib/libdll.so.1
+file path=usr/lib/libshell.so.1
+file path=usr/lib/libsum.so.1
+file path=usr/share/doc/ksh/COMPATIBILITY
+file path=usr/share/doc/ksh/DESIGN
+file path=usr/share/doc/ksh/OBSOLETE
+file path=usr/share/doc/ksh/README
+file path=usr/share/doc/ksh/RELEASE
+file path=usr/share/doc/ksh/TYPES
+file path=usr/share/doc/ksh/images/callouts/1.png
+file path=usr/share/doc/ksh/images/callouts/10.png
+file path=usr/share/doc/ksh/images/callouts/2.png
+file path=usr/share/doc/ksh/images/callouts/3.png
+file path=usr/share/doc/ksh/images/callouts/4.png
+file path=usr/share/doc/ksh/images/callouts/5.png
+file path=usr/share/doc/ksh/images/callouts/6.png
+file path=usr/share/doc/ksh/images/callouts/7.png
+file path=usr/share/doc/ksh/images/callouts/8.png
+file path=usr/share/doc/ksh/images/callouts/9.png
+file path=usr/share/doc/ksh/images/tag_bourne.png
+file path=usr/share/doc/ksh/images/tag_i18n.png
+file path=usr/share/doc/ksh/images/tag_ksh.png
+file path=usr/share/doc/ksh/images/tag_ksh88.png
+file path=usr/share/doc/ksh/images/tag_ksh93.png
+file path=usr/share/doc/ksh/images/tag_l10n.png
+file path=usr/share/doc/ksh/images/tag_perf.png
+file path=usr/share/doc/ksh/shell_styleguide.docbook
+file path=usr/share/man/man1/cksum.1
+file path=usr/share/man/man1/cmp.1
+file path=usr/share/man/man1/comm.1
+file path=usr/share/man/man1/command.1
+file path=usr/share/man/man1/cut.1
+file path=usr/share/man/man1/getopts.1
+file path=usr/share/man/man1/join.1
+file path=usr/share/man/man1/kill.1
+file path=usr/share/man/man1/ksh93.1
+file path=usr/share/man/man1/paste.1
+file path=usr/share/man/man1/print.1
+file path=usr/share/man/man1/rev.1
+file path=usr/share/man/man1/shcomp.1
+file path=usr/share/man/man1/sum.1
+file path=usr/share/man/man1/tee.1
+file path=usr/share/man/man1/test.1
+file path=usr/share/man/man1/type.1
+file path=usr/share/man/man1/umask.1
+file path=usr/share/man/man1/uniq.1
+file path=usr/share/man/man1/wait.1
+file path=usr/share/man/man1/wc.1
+hardlink path=usr/bin/$(ARCH32)/ksh target=ksh93
+hardlink path=usr/bin/$(ARCH32)/rksh target=ksh93
+hardlink path=usr/bin/$(ARCH32)/rksh93 target=ksh93
+hardlink path=usr/bin/$(ARCH64)/ksh target=ksh93
+hardlink path=usr/bin/$(ARCH64)/rksh target=ksh93
+hardlink path=usr/bin/$(ARCH64)/rksh93 target=ksh93
+hardlink path=usr/bin/bg target=alias
+hardlink path=usr/bin/cd target=alias
+hardlink path=usr/bin/cksum target=alias
+hardlink path=usr/bin/cmp target=alias
+hardlink path=usr/bin/comm target=alias
+hardlink path=usr/bin/command target=alias
+hardlink path=usr/bin/cut target=alias
+hardlink path=usr/bin/fc target=alias
+hardlink path=usr/bin/fg target=alias
+hardlink path=usr/bin/getopts target=alias
+hardlink path=usr/bin/hash target=alias
+hardlink path=usr/bin/jobs target=alias
+hardlink path=usr/bin/join target=alias
+hardlink path=usr/bin/kill target=alias
+hardlink path=usr/bin/ksh target=../lib/isaexec
+hardlink path=usr/bin/ksh93 target=../lib/isaexec
+hardlink path=usr/bin/paste target=alias
+hardlink path=usr/bin/pfksh target=pfexec
+hardlink path=usr/bin/pfksh93 target=pfexec
+hardlink path=usr/bin/pfrksh target=pfexec
+hardlink path=usr/bin/pfrksh93 target=pfexec
+hardlink path=usr/bin/pfsh target=pfexec
+hardlink path=usr/bin/print target=alias
+hardlink path=usr/bin/read target=alias
+hardlink path=usr/bin/rev target=alias
+hardlink path=usr/bin/rksh target=../lib/isaexec
+hardlink path=usr/bin/rksh93 target=../lib/isaexec
+hardlink path=usr/bin/sum target=alias
+hardlink path=usr/bin/tee target=alias
+hardlink path=usr/bin/test target=alias
+hardlink path=usr/bin/type target=alias
+hardlink path=usr/bin/ulimit target=alias
+hardlink path=usr/bin/umask target=alias
+hardlink path=usr/bin/unalias target=alias
+hardlink path=usr/bin/uniq target=alias
+hardlink path=usr/bin/wait target=alias
+hardlink path=usr/bin/wc target=alias
+license usr/src/contrib/ast/LICENSE license=usr/src/contrib/ast/LICENSE
+link path=sbin/jsh target=../usr/bin/ksh93
+link path=sbin/sh target=../usr/bin/$(ARCH32)/ksh93
+link path=usr/bin/jsh target=ksh93
+link path=usr/bin/sh target=$(ARCH32)/ksh93
+link path=usr/lib/rsh target=../bin/ksh93
+link path=usr/share/man/man1/jsh.1 target=ksh93.1
+link path=usr/share/man/man1/ksh.1 target=ksh93.1
+link path=usr/share/man/man1/rksh.1 target=ksh93.1
+link path=usr/share/man/man1/rksh93.1 target=ksh93.1
+link path=usr/share/man/man1/sh.1 target=ksh93.1
diff --git a/usr/src/pkg/manifests/source-demo-system.mf b/usr/src/pkg/manifests/source-demo-system.mf
index e3415901dc..21d895f0b2 100644
--- a/usr/src/pkg/manifests/source-demo-system.mf
+++ b/usr/src/pkg/manifests/source-demo-system.mf
@@ -37,7 +37,6 @@ dir path=usr/demo/ksh
 dir path=usr/demo/ksh/bin
 dir path=usr/demo/ksh/fun
 dir path=usr/demo/ksh/src
-dir path=usr/demo/ksh/tests
 dir path=usr/demo/libexacct
 dir path=usr/demo/librtld_db
 dir path=usr/demo/librtld_db/amd64
@@ -107,121 +106,6 @@ file path=usr/demo/ksh/src/svcproptree1.sh
 file path=usr/demo/ksh/src/termclock.sh
 file path=usr/demo/ksh/src/test_net_sctp.sh
 file path=usr/demo/ksh/src/xmldocumenttree1.sh
-file path=usr/demo/ksh/tests/README.tests
-file path=usr/demo/ksh/tests/alias.sh
-file path=usr/demo/ksh/tests/append.sh
-file path=usr/demo/ksh/tests/arith.sh
-file path=usr/demo/ksh/tests/arrays.sh
-file path=usr/demo/ksh/tests/arrays2.sh
-file path=usr/demo/ksh/tests/attributes.sh
-file path=usr/demo/ksh/tests/basic.sh
-file path=usr/demo/ksh/tests/bracket.sh
-file path=usr/demo/ksh/tests/builtins.sh
-file path=usr/demo/ksh/tests/case.sh
-file path=usr/demo/ksh/tests/comvar.sh
-file path=usr/demo/ksh/tests/comvario.sh
-file path=usr/demo/ksh/tests/coprocess.sh
-file path=usr/demo/ksh/tests/cubetype.sh
-file path=usr/demo/ksh/tests/enum.sh
-file path=usr/demo/ksh/tests/exit.sh
-file path=usr/demo/ksh/tests/expand.sh
-file path=usr/demo/ksh/tests/functions.sh
-file path=usr/demo/ksh/tests/glob.sh
-file path=usr/demo/ksh/tests/grep.sh
-file path=usr/demo/ksh/tests/heredoc.sh
-file path=usr/demo/ksh/tests/illumos_13434_chunked_heredoc.sh
-file path=usr/demo/ksh/tests/illumos_4149_builtin_head.sh
-file path=usr/demo/ksh/tests/io.sh
-file path=usr/demo/ksh/tests/leaks.sh
-file path=usr/demo/ksh/tests/locale.sh
-file path=usr/demo/ksh/tests/math.sh
-file path=usr/demo/ksh/tests/nameref.sh
-file path=usr/demo/ksh/tests/namespace.sh
-file path=usr/demo/ksh/tests/options.sh
-file path=usr/demo/ksh/tests/path.sh
-file path=usr/demo/ksh/tests/pointtype.sh
-file path=usr/demo/ksh/tests/pty.sh
-file path=usr/demo/ksh/tests/quoting.sh
-file path=usr/demo/ksh/tests/quoting2.sh
-file path=usr/demo/ksh/tests/readcsv.sh
-file path=usr/demo/ksh/tests/recttype.sh
-file path=usr/demo/ksh/tests/restricted.sh
-file path=usr/demo/ksh/tests/return.sh
-file path=usr/demo/ksh/tests/select.sh
-file path=usr/demo/ksh/tests/shtests mode=0755
-file path=usr/demo/ksh/tests/sigchld.sh
-file path=usr/demo/ksh/tests/signal.sh
-file path=usr/demo/ksh/tests/statics.sh
-file path=usr/demo/ksh/tests/subshell.sh
-file path=usr/demo/ksh/tests/substring.sh
-file path=usr/demo/ksh/tests/sun_solaris_array_default_datatype.sh
-file path=usr/demo/ksh/tests/sun_solaris_builtin_poll.sh
-file path=usr/demo/ksh/tests/sun_solaris_builtin_sum.sh
-file path=usr/demo/ksh/tests/sun_solaris_builtin_tail.sh
-file path=usr/demo/ksh/tests/sun_solaris_command_substitution.sh
-file path=usr/demo/ksh/tests/sun_solaris_compound_misc.sh
-file path=usr/demo/ksh/tests/sun_solaris_compound_nameref.sh
-file path=usr/demo/ksh/tests/sun_solaris_compoundvario.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6778077_sigthaw_trap.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6805792_varmovetest1.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6805795_negative_zero.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh
-file \
-    path=usr/demo/ksh/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh
-file path=usr/demo/ksh/tests/sun_solaris_cr_xxxxxxxx_template.sh
-file path=usr/demo/ksh/tests/sun_solaris_getconf.sh
-file path=usr/demo/ksh/tests/sun_solaris_local_compound_nameref001.sh
-file path=usr/demo/ksh/tests/sun_solaris_locale_misc.sh
-file path=usr/demo/ksh/tests/sun_solaris_staticvariables.sh
-file path=usr/demo/ksh/tests/sun_solaris_vartree001.sh
-file path=usr/demo/ksh/tests/sun_solaris_vartree002.sh
-file path=usr/demo/ksh/tests/sun_solaris_vartree003.sh
-file path=usr/demo/ksh/tests/tilde.sh
-file path=usr/demo/ksh/tests/timetype.sh
-file path=usr/demo/ksh/tests/treemove.sh
-file path=usr/demo/ksh/tests/types.sh
-file path=usr/demo/ksh/tests/variables.sh
-file path=usr/demo/ksh/tests/vartree1.sh
-file path=usr/demo/ksh/tests/vartree2.sh
 file path=usr/demo/libexacct/Makefile
 file path=usr/demo/libexacct/README
 file path=usr/demo/libexacct/exdump.c
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 529e110714..5d84de5864 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -26,7 +26,7 @@
 # Copyright 2017 Nexenta Systems, Inc.
 # Copyright 2017 RackTop Systems.
 # Copyright 2018, Joyent, Inc.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 <include system-library.man3.inc>
@@ -344,15 +344,12 @@ file path=usr/lib/$(ARCH64)/0@0.so.1
 file path=usr/lib/$(ARCH64)/getloginx.so.1
 file path=usr/lib/$(ARCH64)/libads.so.1
 file path=usr/lib/$(ARCH64)/libadutils.so.1
-file path=usr/lib/$(ARCH64)/libast.so.1
 file path=usr/lib/$(ARCH64)/libbsdmalloc.so.1
 file path=usr/lib/$(ARCH64)/libcfgadm.so.1
-file path=usr/lib/$(ARCH64)/libcmd.so.1
 file path=usr/lib/$(ARCH64)/libcommputil.so.1
 file path=usr/lib/$(ARCH64)/libcrle.so.1
 file path=usr/lib/$(ARCH64)/libcrypt.so.1
 file path=usr/lib/$(ARCH64)/libdisasm.so.1
-file path=usr/lib/$(ARCH64)/libdll.so.1
 file path=usr/lib/$(ARCH64)/libexacct.so.1
 file path=usr/lib/$(ARCH64)/libform.so.1
 file path=usr/lib/$(ARCH64)/libfstyp.so.1
@@ -384,12 +381,10 @@ $(i386_ONLY)file path=usr/lib/$(ARCH64)/libsaveargs.so.1
 file path=usr/lib/$(ARCH64)/libsched.so.1
 file path=usr/lib/$(ARCH64)/libsctp.so.1
 file path=usr/lib/$(ARCH64)/libsff.so.1
-file path=usr/lib/$(ARCH64)/libshell.so.1
 file path=usr/lib/$(ARCH64)/libsip.so.1
 file path=usr/lib/$(ARCH64)/libsldap.so.1
 file path=usr/lib/$(ARCH64)/libsmbios.so.1
 file path=usr/lib/$(ARCH64)/libsoftcrypto.so.1
-file path=usr/lib/$(ARCH64)/libsum.so.1
 $(sparc_ONLY)file path=usr/lib/$(ARCH64)/libv12n.so.1
 file path=usr/lib/$(ARCH64)/libvolmgt.so.1
 file path=usr/lib/$(ARCH64)/libwrap.so.1.0
@@ -418,18 +413,15 @@ file path=usr/lib/getloginx.so.1
 file path=usr/lib/lib.b mode=0444
 file path=usr/lib/libads.so.1
 file path=usr/lib/libadutils.so.1
-file path=usr/lib/libast.so.1
 file path=usr/lib/libbsdmalloc.so.1
 $(i386_ONLY)file path=usr/lib/libc/libc_hwcap1.so.1 reboot-needed=true
 $(i386_ONLY)file path=usr/lib/libc/libc_hwcap2.so.1 reboot-needed=true
 $(i386_ONLY)file path=usr/lib/libc/libc_hwcap3.so.1 reboot-needed=true
 file path=usr/lib/libcfgadm.so.1
-file path=usr/lib/libcmd.so.1
 file path=usr/lib/libcommputil.so.1
 file path=usr/lib/libcrle.so.1
 file path=usr/lib/libcrypt.so.1
 file path=usr/lib/libdisasm.so.1
-file path=usr/lib/libdll.so.1
 file path=usr/lib/libexacct.so.1
 file path=usr/lib/libform.so.1
 file path=usr/lib/libfstyp.so.1
@@ -461,12 +453,10 @@ file path=usr/lib/libreparse.so.1
 file path=usr/lib/libsched.so.1
 file path=usr/lib/libsctp.so.1
 file path=usr/lib/libsff.so.1
-file path=usr/lib/libshell.so.1
 file path=usr/lib/libsip.so.1
 file path=usr/lib/libsldap.so.1
 file path=usr/lib/libsmbios.so.1
 file path=usr/lib/libsoftcrypto.so.1
-file path=usr/lib/libsum.so.1
 $(sparc_ONLY)file path=usr/lib/libv12n.so.1
 file path=usr/lib/libvolmgt.so.1
 file path=usr/lib/libwrap.so.1.0
@@ -588,7 +578,6 @@ license usr/src/common/mpi/THIRDPARTYLICENSE \
     license=usr/src/common/mpi/THIRDPARTYLICENSE
 license usr/src/common/util/THIRDPARTYLICENSE.multi3 \
     license=usr/src/common/util/THIRDPARTYLICENSE.multi3
-license usr/src/contrib/ast/LICENSE license=usr/src/contrib/ast/LICENSE
 license usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE \
     license=usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE
 license usr/src/lib/libc/THIRDPARTYLICENSE \
@@ -803,7 +792,6 @@ link path=usr/lib/$(ARCH64)/libc_db.so \
 link path=usr/lib/$(ARCH64)/libc_db.so.1 \
     target=../../../lib/$(ARCH64)/libc_db.so.1
 link path=usr/lib/$(ARCH64)/libcfgadm.so target=libcfgadm.so.1
-link path=usr/lib/$(ARCH64)/libcmd.so target=libcmd.so.1
 link path=usr/lib/$(ARCH64)/libcmdutils.so.1 \
     target=../../../lib/$(ARCH64)/libcmdutils.so.1
 link path=usr/lib/$(ARCH64)/libcommputil.so target=libcommputil.so.1
@@ -1084,7 +1072,6 @@ link path=usr/lib/libc.so.1 target=../../lib/libc.so.1
 link path=usr/lib/libc_db.so target=../../lib/libc_db.so.1
 link path=usr/lib/libc_db.so.1 target=../../lib/libc_db.so.1
 link path=usr/lib/libcfgadm.so target=./libcfgadm.so.1
-link path=usr/lib/libcmd.so target=libcmd.so.1
 link path=usr/lib/libcmdutils.so.1 target=../../lib/libcmdutils.so.1
 link path=usr/lib/libcommputil.so target=./libcommputil.so.1
 link path=usr/lib/libcontract.so target=../../lib/libcontract.so.1
diff --git a/usr/src/pkg/manifests/system-test-ksh93.mf b/usr/src/pkg/manifests/system-test-ksh93.mf
new file mode 100644
index 0000000000..ed9bd073a0
--- /dev/null
+++ b/usr/src/pkg/manifests/system-test-ksh93.mf
@@ -0,0 +1,139 @@
+#
+# 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 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+set name=pkg.fmri value=pkg:/system/test/ksh93@$(PKGVERS)
+set name=pkg.description value="ksh93 unit tests"
+set name=pkg.summary value="AT&T ksh93 test suite"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/System
+dir path=opt/ksh93-tests
+dir path=opt/ksh93-tests/tests
+file path=opt/ksh93-tests/README.tests
+file path=opt/ksh93-tests/shtests mode=0755
+file path=opt/ksh93-tests/tests/alias.sh
+file path=opt/ksh93-tests/tests/append.sh
+file path=opt/ksh93-tests/tests/arith.sh
+file path=opt/ksh93-tests/tests/arrays.sh
+file path=opt/ksh93-tests/tests/arrays2.sh
+file path=opt/ksh93-tests/tests/attributes.sh
+file path=opt/ksh93-tests/tests/basic.sh
+file path=opt/ksh93-tests/tests/bracket.sh
+file path=opt/ksh93-tests/tests/builtins.sh
+file path=opt/ksh93-tests/tests/case.sh
+file path=opt/ksh93-tests/tests/comvar.sh
+file path=opt/ksh93-tests/tests/comvario.sh
+file path=opt/ksh93-tests/tests/coprocess.sh
+file path=opt/ksh93-tests/tests/cubetype.sh
+file path=opt/ksh93-tests/tests/enum.sh
+file path=opt/ksh93-tests/tests/exit.sh
+file path=opt/ksh93-tests/tests/expand.sh
+file path=opt/ksh93-tests/tests/functions.sh
+file path=opt/ksh93-tests/tests/glob.sh
+file path=opt/ksh93-tests/tests/grep.sh
+file path=opt/ksh93-tests/tests/heredoc.sh
+file path=opt/ksh93-tests/tests/illumos_13434_chunked_heredoc.sh
+file path=opt/ksh93-tests/tests/illumos_4149_builtin_head.sh
+file path=opt/ksh93-tests/tests/io.sh
+file path=opt/ksh93-tests/tests/leaks.sh
+file path=opt/ksh93-tests/tests/locale.sh
+file path=opt/ksh93-tests/tests/math.sh
+file path=opt/ksh93-tests/tests/nameref.sh
+file path=opt/ksh93-tests/tests/namespace.sh
+file path=opt/ksh93-tests/tests/options.sh
+file path=opt/ksh93-tests/tests/path.sh
+file path=opt/ksh93-tests/tests/pointtype.sh
+file path=opt/ksh93-tests/tests/pty.sh
+file path=opt/ksh93-tests/tests/quoting.sh
+file path=opt/ksh93-tests/tests/quoting2.sh
+file path=opt/ksh93-tests/tests/readcsv.sh
+file path=opt/ksh93-tests/tests/recttype.sh
+file path=opt/ksh93-tests/tests/restricted.sh
+file path=opt/ksh93-tests/tests/return.sh
+file path=opt/ksh93-tests/tests/select.sh
+file path=opt/ksh93-tests/tests/sigchld.sh
+file path=opt/ksh93-tests/tests/signal.sh
+file path=opt/ksh93-tests/tests/statics.sh
+file path=opt/ksh93-tests/tests/subshell.sh
+file path=opt/ksh93-tests/tests/substring.sh
+file path=opt/ksh93-tests/tests/sun_solaris_array_default_datatype.sh
+file path=opt/ksh93-tests/tests/sun_solaris_builtin_poll.sh
+file path=opt/ksh93-tests/tests/sun_solaris_builtin_sum.sh
+file path=opt/ksh93-tests/tests/sun_solaris_builtin_tail.sh
+file path=opt/ksh93-tests/tests/sun_solaris_command_substitution.sh
+file path=opt/ksh93-tests/tests/sun_solaris_compound_misc.sh
+file path=opt/ksh93-tests/tests/sun_solaris_compound_nameref.sh
+file path=opt/ksh93-tests/tests/sun_solaris_compoundvario.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6778077_sigthaw_trap.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6805792_varmovetest1.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6805795_negative_zero.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh
+file \
+    path=opt/ksh93-tests/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh
+file path=opt/ksh93-tests/tests/sun_solaris_cr_xxxxxxxx_template.sh
+file path=opt/ksh93-tests/tests/sun_solaris_getconf.sh
+file path=opt/ksh93-tests/tests/sun_solaris_local_compound_nameref001.sh
+file path=opt/ksh93-tests/tests/sun_solaris_locale_misc.sh
+file path=opt/ksh93-tests/tests/sun_solaris_staticvariables.sh
+file path=opt/ksh93-tests/tests/sun_solaris_vartree001.sh
+file path=opt/ksh93-tests/tests/sun_solaris_vartree002.sh
+file path=opt/ksh93-tests/tests/sun_solaris_vartree003.sh
+file path=opt/ksh93-tests/tests/tilde.sh
+file path=opt/ksh93-tests/tests/timetype.sh
+file path=opt/ksh93-tests/tests/treemove.sh
+file path=opt/ksh93-tests/tests/types.sh
+file path=opt/ksh93-tests/tests/variables.sh
+file path=opt/ksh93-tests/tests/vartree1.sh
+file path=opt/ksh93-tests/tests/vartree2.sh
+license lic_CDDL license=lic_CDDL
+license usr/src/contrib/ast/LICENSE license=usr/src/contrib/ast/LICENSE