changeset 619:47edfc1a4983

- Do not abort testing after running the sort tests - Add tail testcases for input not ending on a newline - Fix condition where input coming from stdin does not have a trailing newline
author Elie De Brauwer <eliedebrauwer@gmail.com>
date Thu, 05 Jul 2012 22:58:28 +0200
parents 26098529bbe6
children 312e4c3e00b1
files scripts/test/sort.test scripts/test/tail.test toys/tail.c
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/test/sort.test	Thu Jul 05 20:11:40 2012 +0200
+++ b/scripts/test/sort.test	Thu Jul 05 22:58:28 2012 +0200
@@ -97,4 +97,4 @@
   "bork\nNaN\n-inf\n0.4\n1.222\n01.37\n2.1\n+infinity\n" "" \
   "01.37\n1.222\n2.1\n0.4\nNaN\nbork\n-inf\n+infinity\n"
 
-exit $FAILCOUNT
+
--- a/scripts/test/tail.test	Thu Jul 05 20:11:40 2012 +0200
+++ b/scripts/test/tail.test	Thu Jul 05 22:58:28 2012 +0200
@@ -22,6 +22,9 @@
 testing "tail -c+ out of bonds" "tail -c +999 file1" "" "" ""
 rm file1
 
+testing "tail stdin no trailing newline" "tail -n 1 - " "c" "" "a\nb\nc"
+testing "tail file no trailing newline" "tail -n 1 input" "c" "a\nb\nc" ""
+
 optional TAIL_SEEK
 testing "tail noseek -n in bounds" "tail -n 3" "nine\nten\neleven\n" \
 	"" "$BIGTEST"
--- a/toys/tail.c	Thu Jul 05 20:11:40 2012 +0200
+++ b/toys/tail.c	Thu Jul 05 22:58:28 2012 +0200
@@ -176,7 +176,7 @@
 				}
 
 				if (lines) {
-					if(try[count] != '\n') continue;
+					if(try[count] != '\n' && count != len-1) continue;
 					if (lines<0) {
 						if (!++lines) ++lines;
 						continue;