Index: stable/10/bin/sh/tests/expansion/Makefile
===================================================================
--- stable/10/bin/sh/tests/expansion/Makefile	(revision 315178)
+++ stable/10/bin/sh/tests/expansion/Makefile	(revision 315179)
@@ -1,93 +1,96 @@
 # $FreeBSD$
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
 FILESDIR=	${TESTSDIR}
 
 FILES=		arith1.0
 FILES+=		arith2.0
 FILES+=		arith3.0
 FILES+=		arith4.0
 FILES+=		arith5.0
 FILES+=		arith6.0
 FILES+=		arith7.0
 FILES+=		arith8.0
 FILES+=		arith9.0
 FILES+=		arith10.0
 FILES+=		arith11.0
 FILES+=		arith12.0
 FILES+=		arith13.0
 FILES+=		assign1.0
 FILES+=		cmdsubst1.0
 FILES+=		cmdsubst2.0
 FILES+=		cmdsubst3.0
 FILES+=		cmdsubst4.0
 FILES+=		cmdsubst5.0
 FILES+=		cmdsubst6.0
 FILES+=		cmdsubst7.0
 FILES+=		cmdsubst8.0
 FILES+=		cmdsubst9.0
 FILES+=		cmdsubst10.0
 FILES+=		cmdsubst11.0
 FILES+=		cmdsubst12.0
 FILES+=		cmdsubst13.0
 FILES+=		cmdsubst14.0
 FILES+=		cmdsubst15.0
 FILES+=		cmdsubst16.0
 FILES+=		cmdsubst17.0
+FILES+=		cmdsubst18.0
+FILES+=		cmdsubst19.0
+FILES+=		cmdsubst20.0
 FILES+=		export1.0
 FILES+=		export2.0
 FILES+=		export3.0
 FILES+=		heredoc1.0
 FILES+=		heredoc2.0
 FILES+=		ifs1.0
 FILES+=		ifs2.0
 FILES+=		ifs3.0
 FILES+=		ifs4.0
 FILES+=		ifs5.0
 FILES+=		ifs6.0
 FILES+=		ifs7.0
 FILES+=		length1.0
 FILES+=		length2.0
 FILES+=		length3.0
 FILES+=		length4.0
 FILES+=		length5.0
 FILES+=		length6.0
 FILES+=		length7.0
 FILES+=		length8.0
 FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		pathname1.0
 FILES+=		pathname2.0
 FILES+=		pathname3.0
 FILES+=		pathname4.0
 FILES+=		pathname5.0
 FILES+=		plus-minus1.0
 FILES+=		plus-minus2.0
 FILES+=		plus-minus3.0
 FILES+=		plus-minus4.0
 FILES+=		plus-minus5.0
 FILES+=		plus-minus6.0
 FILES+=		plus-minus7.0
 FILES+=		plus-minus8.0
 FILES+=		question1.0
 FILES+=		readonly1.0
 FILES+=		redir1.0
 FILES+=		set-u1.0
 FILES+=		set-u2.0
 FILES+=		set-u3.0
 FILES+=		tilde1.0
 FILES+=		tilde2.0
 FILES+=		trim1.0
 FILES+=		trim2.0
 FILES+=		trim3.0
 FILES+=		trim4.0
 FILES+=		trim5.0
 FILES+=		trim6.0
 FILES+=		trim7.0
 FILES+=		trim8.0
 
 .include <bsd.test.mk>
Index: stable/10/bin/sh/tests/expansion/cmdsubst18.0
===================================================================
--- stable/10/bin/sh/tests/expansion/cmdsubst18.0	(nonexistent)
+++ stable/10/bin/sh/tests/expansion/cmdsubst18.0	(revision 315179)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+x=X
+unset n
+r=${x+$(echo a)}${x-$(echo b)}${n+$(echo c)}${n-$(echo d)}$(echo e)
+[ "$r" = aXde ]

Property changes on: stable/10/bin/sh/tests/expansion/cmdsubst18.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: stable/10/bin/sh/tests/expansion/cmdsubst19.0
===================================================================
--- stable/10/bin/sh/tests/expansion/cmdsubst19.0	(nonexistent)
+++ stable/10/bin/sh/tests/expansion/cmdsubst19.0	(revision 315179)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+b=200 c=30 d=5 x=4
+r=$(echo a)$(($(echo b) + ${x+$(echo c)} + ${x-$(echo d)}))$(echo e)
+[ "$r" = a234e ]

Property changes on: stable/10/bin/sh/tests/expansion/cmdsubst19.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: stable/10/bin/sh/tests/expansion/cmdsubst20.0
===================================================================
--- stable/10/bin/sh/tests/expansion/cmdsubst20.0	(nonexistent)
+++ stable/10/bin/sh/tests/expansion/cmdsubst20.0	(revision 315179)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+set -T
+trapped=''
+trap "trapped=x$trapped" USR1
+[ "x$(kill -USR1 $$)y" = xy ] && [ "$trapped" = x ]

Property changes on: stable/10/bin/sh/tests/expansion/cmdsubst20.0
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: stable/10
===================================================================
--- stable/10	(revision 315178)
+++ stable/10	(revision 315179)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r314637