[git commit] dc: fix testsuite

Denys Vlasenko vda.linux at googlemail.com
Thu Dec 6 17:46:42 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=a1331371748fe23ffaec0720f5c5f4f661c37789
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/dc.c     |  1 +
 testsuite/dc.tests | 24 ++++++------------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 22890147d..bca4778bf 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -248,6 +248,7 @@ int dc_main(int argc UNUSED_PARAM, char **argv)
 {
 	INIT_G();
 
+//TODO: fix this, should take: dc -eSCRIPT -fFILE FILE
 	argv++;
 	if (!argv[0]) {
 		/* take stuff from stdin if no args are given */
diff --git a/testsuite/dc.tests b/testsuite/dc.tests
index a5da5372d..d7a332b9c 100755
--- a/testsuite/dc.tests
+++ b/testsuite/dc.tests
@@ -12,45 +12,33 @@ testing "dc basic syntax (stdin, multiple args)" \
 	"" "10 20+p"
 
 testing "dc basic syntax (argv, single arg)" \
-	"dc '10 20+p'" \
+	"dc -e'10 20+p'" \
 	"30\n" \
 	"" ""
 
 testing "dc basic syntax (argv, multiple args)" \
-	"dc 10 20+p" \
+	"dc -e10 -e20+p" \
 	"30\n" \
 	"" ""
 
 testing "dc complex with spaces (single arg)" \
-	"dc '8 8 * 2 2 + / p'" \
+	"dc -e'8 8 * 2 2 + / p'" \
 	"16\n" \
 	"" ""
 
 testing "dc complex without spaces (single arg)" \
-	"dc '8 8*2 2+/p'" \
+	"dc -e'8 8*2 2+/p'" \
 	"16\n" \
 	"" ""
 
 testing "dc complex with spaces (multiple args)" \
-	"dc 8 8 \* 2 2 + / p" \
+	"dc -e8 -e8 -e\* -e2 -e2 -e+ -e/ -ep" \
 	"16\n" \
 	"" ""
 
 testing "dc complex without spaces (multiple args)" \
-	"dc 8 8\*2 2+/p" \
+	"dc -e8 -e8\*2 -e2+/p" \
 	"16\n" \
 	"" ""
 
 exit $FAILCOUNT
-
-# we do not support arguments
-testing "dc -e <exprs>" \
-	"dc -e '10 2+f'" \
-	"12\n" \
-	"" ""
-
-testing "dc -f <exprs-from-given-file>" \
-	"dc -f input" \
-	"12\n" \
-	"10 2+f" ""
-


More information about the busybox-cvs mailing list