1 files changed, 63 insertions, 59 deletions

diff --git a/tests/wordsplit.at b/tests/wordsplit.at
index 1f2e80d..ebd168b 100644
--- a/tests/wordsplit.at
+++ b/tests/wordsplit.at
@@ -109,5 +109,5 @@ dnl ------------------------------------------------------------
 dnl Test worsplit-specific behavior
 dnl ------------------------------------------------------------
-TESTWSP([append],[wsp-append],[append],
+TESTWSP([append],[wsp-append],[-append],
 [jeden dwa trzy
 cztery
@@ -134,5 +134,5 @@ TOTAL: 2
 ])
 
-TESTWSP([dooffs],[wsp-doofs ],[dooffs 3 jeden dwa trzy],
+TESTWSP([dooffs],[wsp-doofs ],[-dooffs jeden dwa trzy],
 [cztery piec],
 [NF: 2 (3)
@@ -215,5 +215,5 @@ TOTAL: 3
 [unset FOO;])
 
-TESTWSP([undefined variables 2],[],[keepundef],
+TESTWSP([undefined variables 2],[],[-keepundef],
 [a $FOO test a${FOO}b],
 [NF: 4
@@ -227,5 +227,5 @@ TOTAL: 4
 [unset FOO;])
 
-TESTWSP([warn about undefined variables],[],[warnundef],
+TESTWSP([warn about undefined variables],[],[-warnundef],
 [$FOO],
 [NF: 0
@@ -236,5 +236,5 @@ TOTAL: 0
 [unset FOO;])
 
-TESTWSP([bail out on undefined variables],[],[undef],
+TESTWSP([bail out on undefined variables],[],[-undef],
 [$FOO],
 [],
@@ -243,5 +243,5 @@ TESTWSP([bail out on undefined variables],[],[undef],
 [unset FOO;])
 
-TESTWSP([disable variable expansion],[],[novar],
+TESTWSP([disable variable expansion],[],[-novar],
 [$FOO],
 [NF: 1
@@ -253,5 +253,5 @@ TOTAL: 1
 
 TESTWSP([K/V environment],[wsp-env-kv wsp-env_kv],
-[env_kv],
+[-env_kv],
 [$FOO a$BAZ],
 [NF: 2
@@ -263,5 +263,5 @@ TOTAL: 2
 [FOO=bar BAZ=qux])
 
-TESTWSP([nosplit with variable expansion],[wsp-var-nosplit],[nosplit],
+TESTWSP([nosplit with variable expansion],[wsp-var-nosplit],[-nosplit],
 [a $FOO test],
 [NF: 1
@@ -272,5 +272,5 @@ TOTAL: 1
 [FOO="variable expansion"])
 
-TESTWSP([nosplit without variable expansion],[],[nosplit novar],
+TESTWSP([nosplit without variable expansion],[],[-nosplit -novar],
 [a $FOO test],
 [NF: 1
@@ -281,5 +281,5 @@ TOTAL: 1
 [FOO="variable expansion"])
 
-TESTWSP([nosplit: empty expansion],[],[nosplit trimnl],
+TESTWSP([nosplit: empty expansion],[],[-nosplit -trimnl],
 [$FOO],
 [NF: 1
@@ -290,13 +290,4 @@ TOTAL: 1
 [FOO=""])
 
-TESTWSP([default value (defined)],[],[],
-[${FOO:-bar}],
-[NF: 1
-0: qux
-TOTAL: 1
-],
-[],
-[FOO=qux])
-
 TESTWSP([default value],[],[],
 [${FOO:-bar}],
@@ -452,5 +443,5 @@ TOTAL: 2
 WSPGROUP()
 
-TESTWSP([ignore quotes],[wsp-ignore-quotes ],[-quote],
+TESTWSP([ignore quotes],[wsp-ignore-quotes ],[-noquote],
 ["a text"],
 [NF: 2
@@ -463,5 +454,5 @@ WSPGROUP(wsp-delim)
 
 TESTWSP([custom delimiters (squeeze)],[],
-[delim : -ws trimnl],
+[-delim : -nows -trimnl],
 [semicolon: separated::list: of :words],
 [NF: 5
@@ -475,5 +466,5 @@ TOTAL: 5
 
 TESTWSP([custom delimiters (no squeeze)],[],
-[delim : -ws -squeeze_delims trimnl],
+[-delim : -nows -nosqueeze_delims -trimnl],
 [semicolon: separated::list: of :words],
 [NF: 6
@@ -488,5 +479,5 @@ TOTAL: 6
 
 TESTWSP([custom, with returned delimiters],[],
-[delim : -ws trimnl return_delims],
+[-delim : -nows -trimnl -return_delims],
 [semicolon: separated::list: of :words],
 [NF: 9
@@ -504,5 +495,5 @@ TOTAL: 9
 
 TESTWSP([custom, with returned & squeezed delimiters],[],
-[delim : -ws trimnl return_delims -squeeze_delims],
+[-delim : -nows -trimnl -return_delims -nosqueeze_delims],
 [semicolon: separated::list: of :words],
 [NF: 10
@@ -522,5 +513,5 @@ TOTAL: 10
 WSPGROUP(wsp-sed)
 
-TESTWSP([sed expressions],[],[sed],
+TESTWSP([sed expressions],[],[-sed],
 [arg1 s/foo/bar/g;s/bar baz/quz quux/ arg2],
 [NF: 3
@@ -533,5 +524,5 @@ TOTAL: 3
 WSPGROUP()
 
-TESTWSP([C escapes on],[wcp-c-escape],[cescapes],
+TESTWSP([C escapes on],[wcp-c-escape],[-cescapes],
 [a\ttab form\ffeed and new\nline],
 [NF: 4
@@ -543,5 +534,5 @@ TOTAL: 4
 ])
 
-TESTWSP([C escapes off],[wcp-c-escape-off],[-cescapes],
+TESTWSP([C escapes off],[wcp-c-escape-off],[-nocescapes],
 [a\ttab form\ffeed and new\nline],
 [NF: 4
@@ -553,5 +544,5 @@ TOTAL: 4
 ])
 
-TESTWSP([ws elimination],[wsp-ws-elim],[delim ' ()' ws return_delims],
+TESTWSP([ws elimination],[wsp-ws-elim],[-delim ' ()' -ws -return_delims],
 [( list  items  )],
 [NF: 4
@@ -564,5 +555,5 @@ TOTAL: 4
 
 TESTWSP([ws elimination + return delim],[wsp-ws-elim-ret],
-[-default novar nocmd delim ":," return_delims ws dquote],
+[-nodefault -novar -nocmd -delim ":," -return_delims -ws -dquote],
 ["foo" : "bar", "quux" : "baaz" ],
 [NF: 7
@@ -577,5 +568,5 @@ TOTAL: 7
 ])
 
-TESTWSP([empty quotes],[wsp-empty-quotes],[delim : ws return_delims],
+TESTWSP([empty quotes],[wsp-empty-quotes],[-delim : -ws -return_delims],
 [t=""],
 [NF: 1
@@ -585,5 +576,5 @@ TOTAL: 1
 
 TESTWSP([delimiter following empty quotes],
-[],[delim : ws return_delims],
+[],[-delim : -ws -return_delims],
 [t="":r],
 [NF: 3
@@ -596,5 +587,5 @@ TOTAL: 3
 TESTWSP([suppress ws trimming within quotes],
 [],
-[default delim , ws return_delims],
+[-default -delim , -ws -return_delims],
 [nocomponent,nonewline, formatfield="In message %{text}, "],
 [NF: 5
@@ -609,5 +600,5 @@ TOTAL: 5
 TESTWSP([unescape],
 [wsp-unescape wsp-unescape-simple],
-[-default novar nocmd quote escape ':+:\\""'],
+[-nodefault -novar -nocmd -quote -escape ':+:\\""'],
 [\Seen "quote \"" "bs \\"],
 [NF: 3
@@ -620,5 +611,5 @@ TOTAL: 3
 TESTWSP([unescape: word/quote],
 [wsp-unescape wsp-unescape-word],
-[-default novar nocmd quote escape-word '\\""' escape-quote ':+0x:\\""'],
+[-nodefault -novar -nocmd -quote -escape-word '\\""' -escape-quote ':+0x:\\""'],
 [\Seen "quote \"" "bs \\" "3\x31 \101" 3\x31 \101],
 [NF: 6
@@ -632,5 +623,5 @@ TOTAL: 6
 ])
 
-TESTWSP([dquote],[],[-default novar nocmd dquote],
+TESTWSP([dquote],[],[-nodefault -novar -nocmd -dquote],
 [a "quoted example" isn't it],
 [NF: 4
@@ -642,5 +633,5 @@ TOTAL: 4
 ])
 
-TESTWSP([squote],[],[-default novar nocmd squote],
+TESTWSP([squote],[],[-nodefault -novar -nocmd -squote],
 [a 'quoted example' isn"t it],
 [NF: 4
@@ -654,5 +645,5 @@ TOTAL: 4
 WSPGROUP(wsp-incr)
 
-TESTWSP([incremental],[],[incremental],
+TESTWSP([incremental],[],[-incremental],
 [incremental "input test" line
 
@@ -672,5 +663,5 @@ TOTAL: 3
 ])