From 7fa06a287a9634e63b51fa602eadb5b7020f58fb Mon Sep 17 00:00:00 2001
From: jilles <jilles@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 12 Mar 2017 19:49:08 +0000
Subject: [PATCH] MFC r314637: sh: Add some already working tests that exercise
 new code paths

git-svn-id: svn://svn.freebsd.org/base/stable/10@315179 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 bin/sh/tests/expansion/Makefile     | 3 +++
 bin/sh/tests/expansion/cmdsubst18.0 | 6 ++++++
 bin/sh/tests/expansion/cmdsubst19.0 | 5 +++++
 bin/sh/tests/expansion/cmdsubst20.0 | 6 ++++++
 4 files changed, 20 insertions(+)
 create mode 100644 bin/sh/tests/expansion/cmdsubst18.0
 create mode 100644 bin/sh/tests/expansion/cmdsubst19.0
 create mode 100644 bin/sh/tests/expansion/cmdsubst20.0

diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
index d6f3c1a01..fd1c3bb0e 100644
--- a/bin/sh/tests/expansion/Makefile
+++ b/bin/sh/tests/expansion/Makefile
@@ -38,6 +38,9 @@ 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
diff --git a/bin/sh/tests/expansion/cmdsubst18.0 b/bin/sh/tests/expansion/cmdsubst18.0
new file mode 100644
index 000000000..a9791b3ac
--- /dev/null
+++ b/bin/sh/tests/expansion/cmdsubst18.0
@@ -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 ]
diff --git a/bin/sh/tests/expansion/cmdsubst19.0 b/bin/sh/tests/expansion/cmdsubst19.0
new file mode 100644
index 000000000..ae6619a77
--- /dev/null
+++ b/bin/sh/tests/expansion/cmdsubst19.0
@@ -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 ]
diff --git a/bin/sh/tests/expansion/cmdsubst20.0 b/bin/sh/tests/expansion/cmdsubst20.0
new file mode 100644
index 000000000..33932487b
--- /dev/null
+++ b/bin/sh/tests/expansion/cmdsubst20.0
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+set -T
+trapped=''
+trap "trapped=x$trapped" USR1
+[ "x$(kill -USR1 $$)y" = xy ] && [ "$trapped" = x ]
-- 
2.42.0