envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-06-14 00:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: adapt existing tests for new trace verbosity

Browse Source
This commit is contained in:
Xavier Delaruelle
2020-09-05 13:54:17 +02:00
parent e325ce434e
commit b612bf5eae
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testsuite/modules.20-locate/090-memcache.exp
View File

@@ -108,9 +108,10 @@ foo/1 foo/2 foo1/1 foo1/2
(.*)+
DEBUG \\\[#1:load:look/2\\\] findModules: finding 'foo1\\*' in $mpre .*
DEBUG \\\[#1:load:look/2\\\] findModules: use cache entry .*
DEBUG \\\[#1:load:look/2\\\] getModules: got foo1\\S* foo1\\S*
(.*)+
foo1/1 foo1/2
(.*)+
Get modules: {foo1/1 foo1/2} matching 'foo1' in.*
(.*)+"
testerr_cmd_re sh {load -D look/2} $tserr
@@ -121,9 +122,10 @@ DEBUG \\\[#1:load:look/3\\\] findModules: create cache entry .*
(.*)+
DEBUG \\\[#1:load:look/3\\\] findModules: finding 'f\\*' in $mpre .*
DEBUG \\\[#1:load:look/3\\\] findModules: use cache entry .*
DEBUG \\\[#1:load:look/3\\\] getModules: got foo\\S* foo\\S* foo\\S* foo\\S*
(.*)+
foo/1 foo/2 foo1/1 foo1/2
(.*)+
Get modules: {foo\\S* foo\\S* foo\\S* foo\\S*} matching 'f' in.*
(.*)+"
testerr_cmd_re sh {load -D look/3} $tserr
@@ -177,7 +179,8 @@ DEBUG \\\[#1:load:look/7\\\] findModules: create cache entry .*
(.*)+
DEBUG \\\[#1:load:look/7\\\] findModules: finding 'foo' in $mpre .*
DEBUG \\\[#1:load:look/7\\\] findModules: use cache entry .*
DEBUG \\\[#1:load:look/7\\\] getModules: got foo\\S* foo\\S* foo\\S*
(.*)+
Get modules: {foo foo/1 foo/2} matching 'foo' in.*
(.*)+"
testerr_cmd_re sh {load -D look/7} $tserr
@@ -186,13 +189,14 @@ set tserr "(.*)+
DEBUG \\\[#1:load:look/8\\\] findModules: finding 'sp cial\\*' in $mpre .*
(.*)+
DEBUG \\\[#1:load:look/8\\\] findModules: create cache entry .*
DEBUG \\\[#1:load:look/8\\\] getModules: got {sp cial\\S*}
(.*)+
sp cial/1
(.*)+
DEBUG \\\[#1:load:look/8\\\] getModules: use cache entry .*
(.*)+
sp cial/1
(.*)+
Get modules: {{sp cial/1}} matching '{sp cial}' in.*
(.*)+"
testerr_cmd_re sh {load -D look/8} $tserr

10
testsuite/modules.70-maint/070-display.exp
View File

@@ -71,11 +71,11 @@ module-alias\tfoo setenv/1.0
module-version\tfoo foo bar blah
module-whatis\t{Some checks for HELP and DISPLAY}
$modlin"
set out_debug_pat "(DEBUG .*)+
set out_debug_pat "((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
$modlin
$modpathre/help/2.0:
(DEBUG .*)+
((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
set-alias\tal-testsuite {ps -auxww | grep modulecmd}
(DEBUG .*)+
unset-alias\tal-testsuite
@@ -117,13 +117,13 @@ $modpathre/$module_3/before:
[escre [msg_moderr "$msg_invcmdname \"bad-command\"" bad-command $modpath/$module_3/before 26 { }]]
$modlin"
set out_debug_interr "(DEBUG .*)+
set out_debug_interr "((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
[escre [msg_moderr "$msg_invcmdname \"bad-command\"" bad-command $modpath/$module_3/.modulerc 28 { }]]
(DEBUG .*)+
((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
$modlin
$modpathre/$module_3/before:
(DEBUG .*)+
((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
[escre [msg_moderr "$msg_invcmdname \"bad-command\"" bad-command $modpath/$module_3/before 26 { }]]
(DEBUG .*)+
$modlin

11
testsuite/modules.70-maint/080-help.exp
View File

@@ -53,16 +53,15 @@ Module Specific Help for $modpathre/$module:
Help_out
Help_err
$modlin"
set err_debug_help "(DEBUG .*)+
set err_debug_help "((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
$modlin
Module Specific Help for $modpathre/$module:
.*Module Specific Help for $modpathre/$module:
(DEBUG .*)+
(DEBUG .*)+
((DEBUG|Evaluate modulerc:|Evaluate modulefile:|Get modules:) .*)+
DEBUG \\\[#1:help:$module\\\] putsModfileCmd: stderr Help_out \\\(itrp=__modfile_help_1\\\)
Help_out
.*Help_out.*
DEBUG \\\[#1:help:$module\\\] putsModfileCmd: stderr Help_err \\\(itrp=__modfile_help_1\\\)
Help_err
.*Help_err.*
(DEBUG .*)+
$modlin
(DEBUG .*)+"

2
testsuite/modules.70-maint/220-config.exp
View File

@@ -116,7 +116,7 @@ array set configvalid [list\
silent_shell_debug {0 1}\
term_background {dark light}\
unload_match_order {returnlast returnfirst}\
verbosity {silent concise normal verbose debug debug2}\
verbosity {silent concise normal verbose trace debug debug2}\
wa_277 {0 1}\
]