From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Dale Mellor Newsgroups: gmane.lisp.guile.bugs Subject: bug#40719: [PATCH 2/4] test *broken*: augmented tests of (ice-9 getopt-long) Date: Thu, 07 May 2020 18:03:12 +0100 Organization: DM Bespoke Computer Solutions Ltd Message-ID: <1d7a1ced8667b016f73af7fb2f709f2a7c40fe1c.camel@rdmp.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="74113"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.30.5-1.1 To: 40719@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Thu May 07 19:07:41 2020 Return-path: Envelope-to: guile-bugs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jWjzp-000JAM-CF for guile-bugs@m.gmane-mx.org; Thu, 07 May 2020 19:07:41 +0200 Original-Received: from localhost ([::1]:48924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWjzo-00045u-By for guile-bugs@m.gmane-mx.org; Thu, 07 May 2020 13:07:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWjwJ-0006FG-Ur for bug-guile@gnu.org; Thu, 07 May 2020 13:04:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWjwI-0002CV-Fe for bug-guile@gnu.org; Thu, 07 May 2020 13:04:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWjwI-0005W0-AX for bug-guile@gnu.org; Thu, 07 May 2020 13:04:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Thu, 07 May 2020 17:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40719 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch Original-Received: via spool by 40719-submit@debbugs.gnu.org id=B40719.158887100021126 (code B ref 40719); Thu, 07 May 2020 17:04:02 +0000 Original-Received: (at 40719) by debbugs.gnu.org; 7 May 2020 17:03:20 +0000 Original-Received: from localhost ([127.0.0.1]:43825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWjvb-0005Uf-Nh for submit@debbugs.gnu.org; Thu, 07 May 2020 13:03:20 -0400 Original-Received: from ec2-52-19-174-175.eu-west-1.compute.amazonaws.com ([52.19.174.175]:46364 helo=rdmp.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWjva-0005UO-EM for 40719@debbugs.gnu.org; Thu, 07 May 2020 13:03:18 -0400 Original-Received: from [127.0.0.1] (helo=localhost) by rdmp.org with esmtp (Exim 4.92) (envelope-from ) id 1jWjvU-0001EB-Q7 for 40719@debbugs.gnu.org; Thu, 07 May 2020 17:03:12 +0000 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: "bug-guile" Xref: news.gmane.io gmane.lisp.guile.bugs:9750 Archived-At: This is to prepare the ground for some test-driven development mainly to make the module satisfy the needs of the GNU Mcron project. The main requirement is for the module to be more intelligent when dealing with optional values to command-line options: if the following argument looks like a new option then treat it as such, otherwise treat it as the value of the current option. The particular case is mcronʼs -s option which needs to assume a default value of “8” if there is not one on the command line, but currently ‘mcron -s input_file’ fails badly. Other tests introduced involve allowing negative numbers as option values, and dealing with various cases of option-processing termination. * test-suite/tests/getopt-long.test: new code added. --- test-suite/tests/getopt-long.test | 88 ++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/test-suite/tests/getopt-long.test b/test-suite/tests/getopt-long.test index a837b0799..b0530fe62 100644 --- a/test-suite/tests/getopt-long.test +++ b/test-suite/tests/getopt-long.test @@ -78,8 +78,8 @@ (with-test-prefix "exported procs" - (pass-if "`option-ref' defined" (defined? 'option-ref)) - (pass-if "`getopt-long' defined" (defined? 'getopt-long))) + (pass-if "‘option-ref’ defined" (defined? 'option-ref)) + (pass-if "‘getopt-long’ defined" (defined? 'getopt-long))) (with-test-prefix "specifying predicate" @@ -150,6 +150,15 @@ (test "--bar --foo" '((()) (foo . #t) (bar . #t)))) + (pass-if "long option with equals and space" + (test "--foo= test" + '((() "test") (foo . #t)))) + + (pass-if "long option with equals and space, not allowed a value" + (A-TEST "--foo= test" + '((foo (value #f))) + '((() "test") (foo . #t)))) + (pass-if "--=" (test "--=" '((() "--=")))) @@ -167,16 +176,16 @@ (bar))) 'foo #f))) - (pass-if "option-ref `--foo 4'" + (pass-if "option-ref ‘--foo 4’" (test4 "4" "--foo" "4")) - (pass-if "option-ref `-f 4'" + (pass-if "option-ref ‘-f 4’" (test4 "4" "-f" "4")) - (pass-if "option-ref `-f4'" + (pass-if "option-ref ‘-f4’" (test4 "4" "-f4")) - (pass-if "option-ref `--foo=4'" + (pass-if "option-ref ‘--foo=4’" (test4 "4" "--foo=4")) ) @@ -262,8 +271,8 @@ (with-test-prefix "apples-blimps-catalexis example" (define spec '((apples (single-char #\a)) - (blimps (single-char #\b) (value #t)) - (catalexis (single-char #\c) (value #t)))) + (blimps (single-char #\b) (value #t)) + (catalexis (single-char #\c) (value #t)))) (define (test8 . args) (equal? (sort (getopt-long (cons "foo" args) spec) @@ -281,9 +290,38 @@ (pass-if "normal 2" (test8 "-ab" "bang" "-c" "couth")) (pass-if "normal 3" (test8 "-ac" "couth" "-b" "bang")) - (pass-if-fatal-exception "bad ordering causes missing option" - exception:option-must-have-arg - (test8 "-abc" "couth" "bang")) + + ;;;; Dale Mellor 2020-04-14 + ;;;; + ;;;; I disagree with this test: to my mind 'c' is 'b's argument, and + ;;;; the other two arguments are non-options which get passed + ;;;; through; there should not be an exception. + + ;; (pass-if-fatal-exception "bad ordering causes missing option" + ;; exception:option-must-have-arg + ;; (test8 "-abc" "couth" "bang")) + + (pass-if "clumped options with trailing mandatory value" + (A-TEST "-abc couth bang" + spec + '((() "couth" "bang") (apples . #t) (blimps . "c")))) + + (pass-if "clumped options with trailing optional value" + (A-TEST "-abc couth bang" + '((apples (single-char #\a)) + (blimps (single-char #\b) + (value optional))) + '((() "couth" "bang") (apples . #t) (blimps . "c")))) + + (pass-if "clumped options with trailing optional value" + (A-TEST "-abc couth bang" + '((apples (single-char #\a)) + (blimps (single-char #\b) + (value optional)) + (catalexis (single-char #\c) + (value #t))) + '((() "bang") + (apples . #t) (blimps . #t) (catalexis . "couth")))) ) @@ -326,12 +364,19 @@ (with-test-prefix "stop-at-first-non-option" (pass-if "guile-tools compile example" - (equal? (getopt-long '("guile-tools" "compile" "-Wformat" "eval.scm" "-o" "eval.go") + (equal? (getopt-long '("guile-tools" "compile" "-Wformat" + "eval.scm" "-o" "eval.go") '((help (single-char #\h)) (version (single-char #\v))) #:stop-at-first-non-option #t) '((() "compile" "-Wformat" "eval.scm" "-o" "eval.go")))) + (pass-if "stop after option" + (equal? (getopt-long '("foo" "-a" "3" "4" "-b" "4") + '((about (single-char #\a) (value #t)) + (breathe (single-char #\b) (value #t))) + #:stop-at-first-non-option #t) + '((() "4" "-b" "4") (about . "3")))) ) @@ -356,6 +401,11 @@ '((() "--ben" "dave" "--charles") (abby . #t)) #:stop-at-first-non-option #t)) + (pass-if "first non-option before marker" + (test "--abby dave --ben -- --charles" + '((() "dave" "--ben" "--" "--charles") (abby . #t)) + #:stop-at-first-non-option #t)) + (pass-if "double end marker" (test "--abby -- -- --ben" '((() "--" "--ben") (abby . #t)))) @@ -409,6 +459,14 @@ (pass-if "non-predicated -o-1" (test "-c-1" '((()) (charles . "-1")))) + (pass-if-fatal-exception "non-predicated --optional -1" + exception:no-such-option + (test "--charles -1" '((()) (charles . "-1")))) + + (pass-if-fatal-exception "non-predicated -o -1" + exception:no-such-option + (test "-c -1" '((()) (charles . "-1")))) + (pass-if "non-predicated --mandatory=-1" (test "--dave=-1" '((()) (dave . "-1")))) @@ -444,9 +502,15 @@ (pass-if "-s 8" (test "-s 8 file" '((() "file") (schedule . "8")))) + (pass-if "-s file" + (test "-s file" '((() "file") (schedule . #t)))) + (pass-if "-sd file" (test "-sd file" '((() "file") (daemon . #t) (schedule . #t)))) + (pass-if "-ds file" + (test "-ds file" '((() "file") (daemon . #t) (schedule . #t)))) + (pass-if "--schedule=8" (test "--schedule=8 file" '((() "file") (schedule . "8")))) -- 2.20.1