Merge remote-tracking branch 'refs/remotes/origin/master'

2 files changed, 17 insertions, 7 deletions

diff --git a/tests/split.test b/tests/split.test
index 4a522432..57270ffa 100755
--- a/tests/split.test
+++ b/tests/split.test
@@ -5,21 +5,21 @@
 #testing "name" "command" "result" "infile" "stdin"
 
 testing "split" "seq 1 12345 | split && ls xa[a-z] | wc -l" "13\n" "" ""
-rm xa[a-z]
+rm -f xa[a-z]
 
 testing "-" "seq 1 12345 | split - && ls xa[a-z] | wc -l" "13\n" "" ""
-rm xa[a-z]
+rm -f xa[a-z]
 
 seq 1 12345 > file
 testing "file" "split file && ls xa[a-z] | wc -l" "13\n" "" ""
-rm xa[a-z]
+rm -f xa[a-z]
 
-testing "-l" "split file -l 10k && wc -l xab" "2105 xab\n" "" ""
-rm xa[ab]
+toyonly testing "-l" "split file -l 10k && wc -l xab" "2105 xab\n" "" ""
+rm -f xa[ab]
 
 testing "suffix exhaustion" \
   "split file -l 10 -a 1 walrus 2>/dev/null || ls walrus* | wc -l" "26\n" "" ""
-rm walrus*
+rm -f walrus*
 
 testing "bytes" \
   "seq 1 20000 | split -b 100 -a 3 - whang && ls whang* | wc -l && wc -c whangbpw" "1089\n94 whangbpw\n" "" ""
@@ -27,5 +27,9 @@ testing "bytes" \
 testing "reassembly" \
   'ls whang* | sort | xargs cat > reassembled && seq 1 20000 | diff -u reassembled - && echo yes' \
   "yes\n" "" ""
+rm -f file whang* reassembled
+
+testing "-n" "split -n 3 input; md5sum xaa xab xac" \
+  "494bb8fb423bfa1a5fd66dd0b98f866d  xaa\n449acfdbc692780de30a2df05c5d32aa  xab\n15ab4be57aebe9a1e445195d5094036c  xac\n" \
+  "$(seq 1 10000)" ""
 
-rm file whang* reassembled
diff --git a/tests/tail.test b/tests/tail.test
index 036f433c..94644c8f 100755
--- a/tests/tail.test
+++ b/tests/tail.test
@@ -73,3 +73,9 @@ testing "-f one two three" \
   'tail -f one two three & sleep .25 ; echo more >> three ; echo also >> one; sleep .25; kill $! >/dev/null' \
   "==> one <==\nuno\n\n==> two <==\ndos\n\n==> three <==\ntres\nmore\n\n==> one <==\nalso\n" "" ""
 rm one two three
+
+testing "-F" "tail -s .1 -F walrus 2>/dev/null & sleep .2; echo hello > walrus;
+sleep .2; truncate -s 0 walrus; sleep .2; echo potato >> walrus; sleep .2;
+echo hello >> walrus; sleep .2; rm walrus; sleep .2; echo done > walrus;
+  sleep .5; kill %1" "hello\npotato\nhello\ndone\n" "" ""
+rm -f walrus