Merge remote-tracking branch 'upstream/master'HEADmaster

3 files changed, 15 insertions, 0 deletions

diff --git a/testsuite/bc.tests b/testsuite/bc.tests
index 179d5d2a2..1c748727a 100755
--- a/testsuite/bc.tests
+++ b/testsuite/bc.tests
@@ -182,6 +182,11 @@ testing "bc print 1,2,3" \
 	"123" \
 	"" "print 1,2,3"
 
+testing "bc length" \
+	"bc" \
+	"1\n3\n1\n3\n3\n" \
+	"" "length(0); length(100); length(0.01); length(0.00120); length(0.012-0.012);"
+
 testing "bc { print 1 }" \
 	"bc" \
 	"1" \
diff --git a/testsuite/dc.tests b/testsuite/dc.tests
index 361bc8459..ad0099354 100755
--- a/testsuite/dc.tests
+++ b/testsuite/dc.tests
@@ -114,6 +114,11 @@ testing "dc newline can be a register" \
 	"2\n9\n" \
 	"" "[2p]s\n[3p]l\nx\n9p"
 
+testing "dc Z (length) for numbers" \
+	"dc" \
+	"1\n1\n3\n1\n3\n1\n" \
+	"" "0Zp\n0.000Zp\n100Zp\n0.01Zp\n0.00120Zp\n0.0012 0.0012 - Zp\n"
+
 for f in dc_*.dc; do
 	r="`basename "$f" .dc`_results.txt"
 	test -f "$r" || continue
diff --git a/testsuite/start-stop-daemon.tests b/testsuite/start-stop-daemon.tests
index 2ddb7fefb..0757b1288 100755
--- a/testsuite/start-stop-daemon.tests
+++ b/testsuite/start-stop-daemon.tests
@@ -21,8 +21,13 @@ testing "start-stop-daemon without -x and -a" \
 	"1\n" \
 	"" ""
 
+# This runs /bin/false with argv[0..2] of { "qwerty", "false", NULL }.
+#
 # Unfortunately, this does not actually check argv[0] correctness,
 # but at least it checks that pathname to exec() is correct
+#
+# NB: this fails if /bin/false is a busybox symlink:
+# busybox looks at argv[0] and says "qwerty: applet not found"
 testing "start-stop-daemon with both -x and -a" \
 	'start-stop-daemon -S -x /bin/false -a qwerty false 2>&1; echo $?' \
 	"1\n" \