X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fopt.t;h=1c7aca6e2e80f4f1a5b7e9534cb66015ab6d82c0;hb=841068939a49153d682f15e8fefa1d950f7179c0;hp=98cbb4bf34de77b6a7997a4092ebe4821e925755;hpb=ba476db22e16bed8a9a4a9d7a05aa09bf35411c8;p=libucw.git

diff --git a/ucw/opt.t b/ucw/opt.t
index 98cbb4bf..1c7aca6e 100644
--- a/ucw/opt.t
+++ b/ucw/opt.t
@@ -1,25 +1,40 @@
 # Tests of the command line option parser
 
 Name:	Opt-1
-Run:	( ../obj/ucw/opt-t 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 || [ $? -eq "2" ]
+Out:	Required option -t not found.
+	Run with argument --help for more information.
 
 Name:	Opt-2
-Run:	../obj/ucw/opt-t -t95C -w640 -gG darjeeling
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling
 Out:	English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
 
 Name:	Opt-3
-Run:	../obj/ucw/opt-t -vvqvqvhpe -t120F -w4 darjeeling
+Run:	../obj/ucw/opt-test -vvqvqvhpe -t120F -w4 darjeeling
 Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 3|Prayer: yes|Water amount: 4|Gas: no|First tea: darjeeling|Everything OK. Bye.
 
 Name:	Opt-4
-Run:	../obj/ucw/opt-t -t120F -w4 puerh darjeeling earl-gray
-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-gray|Everything OK. Bye.
+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-t -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 || [ $? -eq "2" ]
+Out:	Multiple switches: -h
+	Run with argument --help for more information.
 
 Name:	Opt-6
-Run:	../obj/ucw/opt-t -t120F -w4 -b15 -he -- --puerh darjeeling earl-gray
-Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 1|Black magic: 15|Prayer: no|Water amount: 4|Gas: no|First tea: --puerh|Boiling a tea: darjeeling|Boiling a tea: earl-gray|Everything OK. Bye.
+Run:	../obj/ucw/opt-test -t120F -w4 -b15 -he -- --puerh darjeeling earl-grey
+Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 1|Black magic: 15|Prayer: no|Water amount: 4|Gas: no|First tea: --puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
+
+Name:	Opt-7
+Run:	../obj/ucw/opt-test -t120F -w4 -b15 -b54 -he -- --puerh darjeeling earl-grey
+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" ]
+Out:	Config options (-C, -S) must stand before other options.
+	Run with argument --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:
/(null)=darjeeling] [HOOK-postval:
/(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.