Fri Apr 26 00:57:15 2024 UTC (13d)
tests/cat: clean up

Multiple arguments to atf_set are joined by spaces, there's no need for
an extra space.

The exit status on success must be 0, so don't ignore it.

Remove the unnecessary shell wrapper, as no redirection is going on.


(rillig)
diff -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh
cvs diff -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh (expand / switch to unified diff)

--- src/tests/bin/cat/t_cat.sh 2016/06/16 01:04:58 1.3
+++ src/tests/bin/cat/t_cat.sh 2024/04/26 00:57:15 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $ 1# $NetBSD: t_cat.sh,v 1.4 2024/04/26 00:57:15 rillig Exp $
2# 2#
3# Copyright (c) 2012 The NetBSD Foundation, Inc. 3# Copyright (c) 2012 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Jukka Ruohonen. 7# by Jukka Ruohonen.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -20,52 +20,52 @@ @@ -20,52 +20,52 @@
20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 20# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 21# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 22# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28# POSSIBILITY OF SUCH DAMAGE. 28# POSSIBILITY OF SUCH DAMAGE.
29# 29#
30 30
31atf_test_case align 31atf_test_case align
32align_head() { 32align_head() {
33 atf_set "descr" "Test that cat(1) aligns the output " \ 33 atf_set "descr" "Test that cat(1) aligns the output" \
34 "right with options '-be' (PR bin/4841)" 34 "right with options '-be' (PR bin/4841)"
35} 35}
36 36
37align_body() { 37align_body() {
38 38
39 atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \ 39 atf_check -o file:$(atf_get_srcdir)/d_align.out \
40 -x "cat -be $(atf_get_srcdir)/d_align.in" 40 cat -be $(atf_get_srcdir)/d_align.in
41} 41}
42 42
43atf_test_case nonexistent 43atf_test_case nonexistent
44nonexistent_head() { 44nonexistent_head() {
45 atf_set "descr" "Test that cat(1) doesn't return zero exit " \ 45 atf_set "descr" "Test that cat(1) doesn't return zero exit" \
46 "status for a nonexistent file (PR bin/3538)" 46 "status for a nonexistent file (PR bin/3538)"
47} 47}
48 48
49nonexistent_body() { 49nonexistent_body() {
50 50
51 atf_check -s not-exit:0 -o empty -e not-empty \ 51 atf_check -s not-exit:0 -e not-empty \
52 -x "cat /some/name/that/does/not/exist" 52 cat /some/name/that/does/not/exist
53} 53}
54 54
55atf_test_case se_output 55atf_test_case se_output
56se_output_head() { 56se_output_head() {
57 atf_set "descr" "Test that cat(1) prints a $ sign " \ 57 atf_set "descr" "Test that cat(1) prints a $ sign" \
58 "on blank lines with options '-se' (PR bin/51250)" 58 "on blank lines with options '-se' (PR bin/51250)"
59} 59}
60 60
61se_output_body() { 61se_output_body() {
62 atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \ 62 atf_check -o file:$(atf_get_srcdir)/d_se_output.out \
63 -x "cat -se $(atf_get_srcdir)/d_se_output.in" 63 cat -se $(atf_get_srcdir)/d_se_output.in
64} 64}
65 65
66atf_init_test_cases() 66atf_init_test_cases()
67{ 67{
68 atf_add_test_case align 68 atf_add_test_case align
69 atf_add_test_case nonexistent 69 atf_add_test_case nonexistent
70 atf_add_test_case se_output 70 atf_add_test_case se_output
71} 71}