From 20f67f157c2284057328e6391d10e329b088f8d2 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 30 Jun 2016 10:39:41 -0500 Subject: Teach wc to do -cm together. Fix testsuite so TEST_HOST passes too. --- tests/wc.test | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/wc.test') diff --git a/tests/wc.test b/tests/wc.test index abb237e8..d227b9c0 100755 --- a/tests/wc.test +++ b/tests/wc.test @@ -12,16 +12,14 @@ lines EOF testing "wc" "wc >/dev/null && echo yes" "yes\n" "" "" -testing "empty file" "wc" "0 0 0\n" "" "" -testing "standard input" "wc" "1 3 5\n" "" "a b\nc" +testing "empty file" "wc" " 0 0 0\n" "" "" +testing "standard input" "wc" " 1 3 5\n" "" "a b\nc" testing "-c" "wc -c file1" "26 file1\n" "" "" testing "-l" "wc -l file1" "4 file1\n" "" "" testing "-w" "wc -w file1" "5 file1\n" "" "" -testing "format" "wc file1" "4 5 26 file1\n" "" "" +NOSPACE=1 testing "format" "wc file1" " 4 5 26 file1\n" "" "" testing "multiple files" "wc input - file1" \ - "1 2 3 input\n0 2 3 -\n4 5 26 file1\n5 9 32 total\n" "a\nb" "a b" - -optional TOYBOX_I18N + " 1 2 3 input\n 0 2 3 -\n 4 5 26 file1\n 5 9 32 total\n" "a\nb" "a b" #Tests for wc -m if printf "%s" "$LANG" | grep -q UTF-8 @@ -33,13 +31,14 @@ do printf "ü" >> file1 done testing "-m" "wc -m file1" "8193 file1\n" "" "" +testing "-m 2" 'cat "$FILES/utf8/test2.txt" | wc -m' "169\n" "" "" printf " " > file1 for i in $(seq 1 8192) do printf "ü" >> file1 done testing "-m (invalid chars)" "wc -m file1" "8193 file1\n" "" "" -testing "-mlw" "wc -mlw input" "1 2 11 input\n" "hello, 世界!\n" "" +NOSPACE=1 testing "-mlw" "wc -mlw input" " 1 2 11 input\n" "hello, 世界!\n" "" else printf "skipping tests for wc -m" -- cgit v1.2.3