svn commit: trunk/busybox: coreutils testsuite

[landley at busybox.net]

Author: landley
Date: 2006-04-27 15:36:32 -0700 (Thu, 27 Apr 2006)
New Revision: 14948

Log:
Re-wordwrap the new tests, and fix seq.c to pass them.


Modified:
   trunk/busybox/coreutils/seq.c
   trunk/busybox/testsuite/seq.tests


Changeset:
Modified: trunk/busybox/coreutils/seq.c
===================================================================
--- trunk/busybox/coreutils/seq.c	2006-04-27 13:46:56 UTC (rev 14947)
+++ trunk/busybox/coreutils/seq.c	2006-04-27 22:36:32 UTC (rev 14948)
@@ -29,13 +29,11 @@
 	}
 
 	/* You should note that this is pos-5.0.91 semantics, -- FK. */
-	if (first <= last ? increment > 0 : increment < 0) {
-		for (i = first;
-			 (first <= last) ? (i <= last) : (i >= last);
-			 i += increment)
-		{
-				printf("%g\n", i);
-		}
+	for (i = first;
+         (increment > 0 && i <= last) || (increment < 0 && i >=last);
+		 i += increment)
+	{
+		printf("%g\n", i);
 	}
 
 	return EXIT_SUCCESS;

Modified: trunk/busybox/testsuite/seq.tests
===================================================================
--- trunk/busybox/testsuite/seq.tests	2006-04-27 13:46:56 UTC (rev 14947)
+++ trunk/busybox/testsuite/seq.tests	2006-04-27 22:36:32 UTC (rev 14948)
@@ -22,10 +22,10 @@
 testing "seq two arguments" "seq 5 7" "5\n6\n7\n" "" ""
 testing "seq two arguments reversed" "seq 7 5" "" "" ""
 testing "seq two arguments equal" "seq 3 3" "3\n" "" ""
-# test negative non-null step
-testing "seq two arguments equal, arbitrary negative step" "seq 1 -15 1" "1\n" "" ""
-# test positive non-null step
-testing "seq two arguments equal, arbitrary positive step" "seq 1 +15 1" "1\n" "" ""
+testing "seq two arguments equal, arbitrary negative step" "seq 1 -15 1" \
+	"1\n" "" ""
+testing "seq two arguments equal, arbitrary positive step" "seq 1 +15 1" \
+	"1\n" "" ""
 testing "seq count up by 2" "seq 4 2 8" "4\n6\n8\n" "" ""
 testing "seq count down by 2" "seq 8 -2 4" "8\n6\n4\n" "" ""
 testing "seq count wrong way #1" "seq 4 -2 8" "" "" ""