Opt: opt_failure() is public, opt_usage() not so

[libucw.git] / ucw / opt.t

diff --git a/ucw/opt.t b/ucw/opt.t
index d59b850502913414c012ccdc528a01d002dc9d88..26c9ab371384a8d9c6bf4ef9065a6bf66544e10d 100644 (file)
--- a/ucw/opt.t
+++ b/ucw/opt.t
@@ -1,8 +1,10 @@
 # Tests of the command line option parser
 
 Name:  Opt-1
-Run:   ( ../obj/ucw/opt-test 2>&1 1>/dev/null || [ $? -eq "2" ] ) | tr -d '\n'
-Out:   Required option -t not found.Run with argument --help for more information.
+Run:   ../obj/ucw/opt-test 2>&1 1>/dev/null
+Exit:  2
+Out:   Required option -t/--temperature not found.
+       Run with --help for more information.
 
 Name:  Opt-2
 Run:   ../obj/ucw/opt-test -t95C -w640 -gG darjeeling
@@ -17,8 +19,10 @@ Run: ../obj/ucw/opt-test -t120F -w4 puerh darjeeling earl-grey
 Out:   English style: no|Temperature: 120F|Verbosity: 1|Prayer: no|Water amount: 4|Gas: no|First tea: puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
 
 Name:  Opt-5
-Run:   ( ../obj/ucw/opt-test -ghx 2>&1 1>/dev/null || [ $? -eq "2" ] ) | tr -d '\n'
-Out:   Multiple switches: -hRun with argument --help for more information.
+Run:   ../obj/ucw/opt-test -ghx 2>&1 1>/dev/null
+Exit:  2
+Out:   Multiple switches: -h
+       Run with --help for more information.
 
 Name:  Opt-6
 Run:   ../obj/ucw/opt-test -t120F -w4 -b15 -he -- --puerh darjeeling earl-grey
@@ -29,9 +33,11 @@ Run: ../obj/ucw/opt-test -t120F -w4 -b15 -b54 -he -- --puerh darjeeling earl-gre
 Out:   English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 1|Black magic: 15|Black magic: 54|Prayer: no|Water amount: 4|Gas: no|First tea: --puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
 
 Name:  Opt-Conf-1
-Run:   ( ../obj/ucw/opt-test -h --dumpconfig 2>&1 1>/dev/null || [ $? -eq "2" ] ) | tr -d '\n'
-Out:   Config options (-C, -S) must stand before other options.Run with argument --help for more information.
+Run:   ../obj/ucw/opt-test -h -SX.Y=Z 2>&1 1>/dev/null
+Exit:  2
+Out:   Config options must stand before other options.
+       Run with --help for more information.
 
 Name:  Opt-Hook-1
 Run:   ../obj/ucw/opt-test -Ht 95C -w640 -gG darjeeling
-Out:   [HOOK-postval:H/show-hooks=(null)] [HOOK-preval:t/temperature=95C] [HOOK-postval:t/temperature=95C] [HOOK-prearg] [HOOK-preval:w/water=640] [HOOK-postval:w/water=640] [HOOK-prearg] [HOOK-preval:g/glass-set=(null)] [HOOK-postval:g/glass-set=(null)] [HOOK-preval:G/with-gas=(null)] [HOOK-postval:G/with-gas=(null)] [HOOK-prearg] [HOOK-preval:\ 1/(null)=darjeeling] [HOOK-postval:\ 1/(null)=darjeeling] English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+Out:   [HOOK-postval:H/show-hooks=(null)] [HOOK-preval:t/temperature=95C] [HOOK-postval:t/temperature=95C] [HOOK-prearg] [HOOK-preval:w/water=640] [HOOK-postval:w/water=640] [HOOK-prearg] [HOOK-preval:g/glass-set=(null)] [HOOK-postval:g/glass-set=(null)] [HOOK-preval:G/with-gas=(null)] [HOOK-postval:G/with-gas=(null)] [HOOK-prearg] [HOOK-preval:\81/(null)=darjeeling] [HOOK-postval:\81/(null)=darjeeling] English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.