From 24b55fb76dbda93e35ac35be71b64bf0fabd5e54 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Thu, 27 Apr 2017 18:52:18 +0000
Subject: [PATCH] sh: Add some tests for command substitution final newline
 stripping.

---
 bin/sh/tests/expansion/Makefile     | 2 ++
 bin/sh/tests/expansion/cmdsubst25.0 | 7 +++++++
 bin/sh/tests/expansion/cmdsubst26.0 | 6 ++++++
 3 files changed, 15 insertions(+)
 create mode 100644 bin/sh/tests/expansion/cmdsubst25.0
 create mode 100644 bin/sh/tests/expansion/cmdsubst26.0

diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
index 078220ef990a..f3cfc22b17c6 100644
--- a/bin/sh/tests/expansion/Makefile
+++ b/bin/sh/tests/expansion/Makefile
@@ -46,6 +46,8 @@ ${PACKAGE}FILES+=	cmdsubst21.0
 ${PACKAGE}FILES+=	cmdsubst22.0
 ${PACKAGE}FILES+=	cmdsubst23.0
 ${PACKAGE}FILES+=	cmdsubst24.0
+${PACKAGE}FILES+=	cmdsubst25.0
+${PACKAGE}FILES+=	cmdsubst26.0
 ${PACKAGE}FILES+=	export1.0
 ${PACKAGE}FILES+=	export2.0
 ${PACKAGE}FILES+=	export3.0
diff --git a/bin/sh/tests/expansion/cmdsubst25.0 b/bin/sh/tests/expansion/cmdsubst25.0
new file mode 100644
index 000000000000..83cca7d0b97e
--- /dev/null
+++ b/bin/sh/tests/expansion/cmdsubst25.0
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+IFS=' '
+set -- `printf '\n '`
+IFS=:
+[ "$*" = '
+' ]
diff --git a/bin/sh/tests/expansion/cmdsubst26.0 b/bin/sh/tests/expansion/cmdsubst26.0
new file mode 100644
index 000000000000..68a624b12471
--- /dev/null
+++ b/bin/sh/tests/expansion/cmdsubst26.0
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+nl='
+'
+v=$nl`printf '\n'`
+[ "$v" = "$nl" ]