seq: fix testsuite failures

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 14 insertions, 10 deletions

diff --git a/testsuite/runtest b/testsuite/runtest
index cade871a2..2d60591fb 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -120,11 +120,13 @@ fi
 
 # Populate a directory with links to all busybox applets
 
+# Note: if $LINKSDIR/applet exists, we do not overwrite it.
+# Useful if one wants to run tests against a standard utility, not an applet.
 LINKSDIR="$bindir/runtest-tempdir-links"
-rm -rf "$LINKSDIR" 2>/dev/null
-mkdir "$LINKSDIR"
+#rm -rf "$LINKSDIR" 2>/dev/null
+mkdir "$LINKSDIR" 2>/dev/null
 for i in $implemented; do
-        ln -s "$bindir/busybox" "$LINKSDIR/$i"
+        ln -s "$bindir/busybox" "$LINKSDIR/$i" 2>/dev/null
 done
 
 # Set up option flags so tests can be selective.
@@ -142,7 +144,7 @@ for applet in $applets; do
 
         # Is this a new-style test?
         if [ -f "$applet.tests" ]; then
-                if [ ! -h "$LINKSDIR/$applet" ]; then
+                if [ ! -e "$LINKSDIR/$applet" ]; then
                         # (avoiding bash'ism "${applet:0:4}")
                         if ! echo "$applet" | grep "^all_" >/dev/null; then
                                 echo "SKIPPED: $applet (not built)"
diff --git a/testsuite/seq.tests b/testsuite/seq.tests
index 4e43d0ee1..817e1a724 100755
--- a/testsuite/seq.tests
+++ b/testsuite/seq.tests
@@ -29,16 +29,18 @@ 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" "" "" ""
 testing "seq count wrong way #2" "seq 8 2 4" "" "" ""
-# Fails: first item is printed as 3, not 3.0
-# note: makes sense to fix "seq 3 .30 4" case as well
 testing "seq count by .3" "seq 3 .3 4" "3.0\n3.3\n3.6\n3.9\n" "" ""
-testing "seq count by -.9" "seq .7 -.9 -2.2" "0.7\n-0.2\n-1.1\n-2\n" "" ""
-testing "seq count by zero" "seq 4 0 8 | head -n 10" "" "" ""
+testing "seq count by .30" "seq 3 .30 4" "3.00\n3.30\n3.60\n3.90\n" "" ""
+testing "seq count by .30 to 4.000" "seq 3 .30 4.000" "3.00\n3.30\n3.60\n3.90\n" "" ""
+testing "seq count by -.9" "seq .7 -.9 -2.2" "0.7\n-0.2\n-1.1\n-2.0\n" "" ""
+testing "seq count by zero" "seq 4 0 8 | head -n 10" "4\n4\n4\n4\n4\n4\n4\n4\n4\n4\n" "" ""
 
 testing "seq one argument with padding" "seq -w 003" "001\n002\n003\n" "" ""
 testing "seq two arguments with padding" "seq -w 005 7" "005\n006\n007\n" "" ""
 testing "seq count down by 3 with padding" "seq -w 8 -3 04" "08\n05\n" "" ""
-# Known to fail
-testing "seq count by .3 with padding" "seq -w 03 .3 0004" "003.0\n003.3\n003.6\n003.9\n" "" ""
+# Looks like a bug in coreutils 6.10: it uses width one less than needed
+# These tests contain the expected "fixed" output
+testing "seq count by .3 with padding 1" "seq -w 09 .3 11" "09.0\n09.3\n09.6\n09.9\n10.2\n10.5\n10.8\n" "" ""
+testing "seq count by .3 with padding 2" "seq -w 03 .3 0004" "0003.0\n0003.3\n0003.6\n0003.9\n" "" ""
 
 exit $FAILCOUNT