d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the tests for install(1): add support for STRIPBIN's -o option.

Browse Source 
Reported by:	lwhsu
MFC after:	1 week
This commit is contained in:
eugen 2020-07-10 22:59:26 +00:00
parent 8f75ec4950
commit 891c49fe3e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/xinstall/tests/install_test.sh
View File

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