From 891c49fe3ea81bd9d1bf4a9b0a6d03624af53b32 Mon Sep 17 00:00:00 2001
From: eugen <eugen@FreeBSD.org>
Date: Fri, 10 Jul 2020 22:59:26 +0000
Subject: [PATCH] Fix the tests for install(1): add support for STRIPBIN's -o
 option.

Reported by:	lwhsu
MFC after:	1 week
---
 usr.bin/xinstall/tests/install_test.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh
index 92044f34c20b..c723a6e0d280 100755
--- a/usr.bin/xinstall/tests/install_test.sh
+++ b/usr.bin/xinstall/tests/install_test.sh
@@ -186,8 +186,12 @@ overwrite_backup_safe_comparing_body() {
 setup_stripbin() {
 	cat <<\STRIPBIN >stripbin
 #!/bin/sh
-tr z @ <"$1" >"$1.new" && mv -- "$1.new" "$1"
+[ "$1" = "-o" ] && dst="$2" && shift 2
+[ "$1" = "--" ] && shift
+[ -z "$dst" ] && dst="$1"
 STRIPBIN
+	[ "$1" = "true" ] && cmd="cat" || cmd="tr z @"
+	echo $cmd '<"$1" >"$1.new" && mv -- "$1.new" "$dst"' >>stripbin
 	chmod 755 stripbin
 	export STRIPBIN="$PWD/stripbin"
 }
@@ -253,7 +257,7 @@ strip_changing_overwrite_eq_comparing_body() {
 
 atf_test_case strip_noop
 strip_noop_body() {
-	export STRIPBIN=true
+	setup_stripbin true
 	printf 'test\n123\r456\r\n789\0z' >testf
 	atf_check install -s testf copyf
 	[ ! testf -nt copyf ] || atf_fail "bad timestamp"