diff options
author | Rob Landley <rob@landley.net> | 2006-04-27 22:36:32 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-04-27 22:36:32 +0000 |
commit | d5b9428bb6e9d7524f6ef24868ce6394ade08255 (patch) | |
tree | aca91e7ec2511fb75a34c1025286936a572b0bfa | |
parent | a345dc855f276aba580a841d0c00423b1aa9a5b1 (diff) | |
download | busybox-w32-d5b9428bb6e9d7524f6ef24868ce6394ade08255.tar.gz busybox-w32-d5b9428bb6e9d7524f6ef24868ce6394ade08255.tar.bz2 busybox-w32-d5b9428bb6e9d7524f6ef24868ce6394ade08255.zip |
Re-wordwrap the new tests, and fix seq.c to pass them.
-rw-r--r-- | coreutils/seq.c | 12 | ||||
-rwxr-xr-x | testsuite/seq.tests | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/coreutils/seq.c b/coreutils/seq.c index f4d891772..0df094001 100644 --- a/coreutils/seq.c +++ b/coreutils/seq.c | |||
@@ -29,13 +29,11 @@ int seq_main(int argc, char **argv) | |||
29 | } | 29 | } |
30 | 30 | ||
31 | /* You should note that this is pos-5.0.91 semantics, -- FK. */ | 31 | /* You should note that this is pos-5.0.91 semantics, -- FK. */ |
32 | if (first <= last ? increment > 0 : increment < 0) { | 32 | for (i = first; |
33 | for (i = first; | 33 | (increment > 0 && i <= last) || (increment < 0 && i >=last); |
34 | (first <= last) ? (i <= last) : (i >= last); | 34 | i += increment) |
35 | i += increment) | 35 | { |
36 | { | 36 | printf("%g\n", i); |
37 | printf("%g\n", i); | ||
38 | } | ||
39 | } | 37 | } |
40 | 38 | ||
41 | return EXIT_SUCCESS; | 39 | return EXIT_SUCCESS; |
diff --git a/testsuite/seq.tests b/testsuite/seq.tests index 4b2524b19..2a76d86f9 100755 --- a/testsuite/seq.tests +++ b/testsuite/seq.tests | |||
@@ -22,10 +22,10 @@ testing "seq one argument" "seq 3" "1\n2\n3\n" "" "" | |||
22 | testing "seq two arguments" "seq 5 7" "5\n6\n7\n" "" "" | 22 | testing "seq two arguments" "seq 5 7" "5\n6\n7\n" "" "" |
23 | testing "seq two arguments reversed" "seq 7 5" "" "" "" | 23 | testing "seq two arguments reversed" "seq 7 5" "" "" "" |
24 | testing "seq two arguments equal" "seq 3 3" "3\n" "" "" | 24 | testing "seq two arguments equal" "seq 3 3" "3\n" "" "" |
25 | # test negative non-null step | 25 | testing "seq two arguments equal, arbitrary negative step" "seq 1 -15 1" \ |
26 | testing "seq two arguments equal, arbitrary negative step" "seq 1 -15 1" "1\n" "" "" | 26 | "1\n" "" "" |
27 | # test positive non-null step | 27 | testing "seq two arguments equal, arbitrary positive step" "seq 1 +15 1" \ |
28 | testing "seq two arguments equal, arbitrary positive step" "seq 1 +15 1" "1\n" "" "" | 28 | "1\n" "" "" |
29 | testing "seq count up by 2" "seq 4 2 8" "4\n6\n8\n" "" "" | 29 | testing "seq count up by 2" "seq 4 2 8" "4\n6\n8\n" "" "" |
30 | testing "seq count down by 2" "seq 8 -2 4" "8\n6\n4\n" "" "" | 30 | testing "seq count down by 2" "seq 8 -2 4" "8\n6\n4\n" "" "" |
31 | testing "seq count wrong way #1" "seq 4 -2 8" "" "" "" | 31 | testing "seq count wrong way #1" "seq 4 -2 8" "" "" "" |