svn commit: r315168 - stable/11/bin/sh/tests/expansion

[Jilles Tjoelker]

Author: jilles
Date: Sun Mar 12 18:24:45 2017
New Revision: 315168
URL: https://svnweb.freebsd.org/changeset/base/315168

Log:
  MFC r314637: sh: Add some already working tests that exercise new code paths

Added:
  stable/11/bin/sh/tests/expansion/cmdsubst18.0
     - copied unchanged from r314637, head/bin/sh/tests/expansion/cmdsubst18.0
  stable/11/bin/sh/tests/expansion/cmdsubst19.0
     - copied unchanged from r314637, head/bin/sh/tests/expansion/cmdsubst19.0
  stable/11/bin/sh/tests/expansion/cmdsubst20.0
     - copied unchanged from r314637, head/bin/sh/tests/expansion/cmdsubst20.0
Modified:
  stable/11/bin/sh/tests/expansion/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/sh/tests/expansion/Makefile
==============================================================================
--- stable/11/bin/sh/tests/expansion/Makefile	Sun Mar 12 18:07:03 2017	(r315167)
+++ stable/11/bin/sh/tests/expansion/Makefile	Sun Mar 12 18:24:45 2017	(r315168)
@@ -39,6 +39,9 @@ ${PACKAGE}FILES+=	cmdsubst14.0
 ${PACKAGE}FILES+=	cmdsubst15.0
 ${PACKAGE}FILES+=	cmdsubst16.0
 ${PACKAGE}FILES+=	cmdsubst17.0
+${PACKAGE}FILES+=	cmdsubst18.0
+${PACKAGE}FILES+=	cmdsubst19.0
+${PACKAGE}FILES+=	cmdsubst20.0
 ${PACKAGE}FILES+=	export1.0
 ${PACKAGE}FILES+=	export2.0
 ${PACKAGE}FILES+=	export3.0

Copied: stable/11/bin/sh/tests/expansion/cmdsubst18.0 (from r314637, head/bin/sh/tests/expansion/cmdsubst18.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/bin/sh/tests/expansion/cmdsubst18.0	Sun Mar 12 18:24:45 2017	(r315168, copy of r314637, head/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 ]

Copied: stable/11/bin/sh/tests/expansion/cmdsubst19.0 (from r314637, head/bin/sh/tests/expansion/cmdsubst19.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/bin/sh/tests/expansion/cmdsubst19.0	Sun Mar 12 18:24:45 2017	(r315168, copy of r314637, head/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 ]

Copied: stable/11/bin/sh/tests/expansion/cmdsubst20.0 (from r314637, head/bin/sh/tests/expansion/cmdsubst20.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/bin/sh/tests/expansion/cmdsubst20.0	Sun Mar 12 18:24:45 2017	(r315168, copy of r314637, head/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 ]