Skip to content

Commit

Permalink
ts: adapt tests for forced reqlo error reported fix
Browse files Browse the repository at this point in the history 
By-passed failure of requirement load is now reported on module requiring
this load instead of a Requirement missing warning message on this module
and a Requirement load failure warning message on top message block.
  • Loading branch information
@xdelaruelle
xdelaruelle committed Sep 10, 2023
1 parent 90990ff commit 7509491
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions testsuite/modules.50-cmds/377-error.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ lappend ans [list set _LMFILES_ $mp/rag:$mp/rah]
lappend ans [list set LOADEDMODULES rag:rah]
lappend ans [list set __MODULES_LMTAG rag&auto-loaded]
lappend ans [list ERR]
set tserr [list {load rah} {load rag} {load raf} {load rae} \n[msg_load raf $err_evalabort] \n[msg_load {rag <aL>} [err_reqmisf raf]] \n[msg_top_load rah {} rag {} [err_reqlof raf]]]
set tserr [list {load rah} {load rag} {load raf} {load rae} \n[msg_load raf $err_evalabort] \n[msg_load {rag <aL>} [err_reqlof raf]] \n[msg_top_load rah {} rag {}]]
testouterr_cmd_re sh {load --force rah} $ans [join $tserr \n]


Expand Down Expand Up @@ -356,7 +356,7 @@ lappend ans [list set _LMFILES_ $mp/rfa:$mp/rfd:$mp/rfk:$mp/rfb:$mp/rfc:$mp/rfe:
lappend ans [list set __MODULES_LMPREREQ rfd&rfa|rfb&rfc:rfk&rfj:rfb&rfk:rfc&rfa|rfb:rfe&rfa|rfb&rfd:rff&rfa|rfb:rfh&rfa|rfb&rfg]
lappend ans [list set __MODULES_LMTAG rfk&auto-loaded]
lappend ans [list ERR]
set tserr [list {unload rfh} {unload rfg} {unload rff} {unload rfe} {unload rfd} \n[msg_unload rfd $err_evalabort]\n {unload rfc} {load rfb} {load rfk} {load rfj} {load rfi} \n[msg_load rfj $err_evalabort] \n[msg_load {rfk <aL>} [err_reqmisf rfj]]\n {load rfc} {load rfe} {load rff} {load rfg} \n[msg_load rfg $err_evalabort]\n {load rfh} \n[msg_load rfh [err_reqmisf rfg]] \n[msg_top_load rfb {} rfk [list [list rfh rfg rff rfe rfc] [list rfc rfe rff rfh]] [err_depreunf rfd] [err_reqlof rfj] [err_depref rfg]]]
set tserr [list {unload rfh} {unload rfg} {unload rff} {unload rfe} {unload rfd} \n[msg_unload rfd $err_evalabort]\n {unload rfc} {load rfb} {load rfk} {load rfj} {load rfi} \n[msg_load rfj $err_evalabort] \n[msg_load {rfk <aL>} [err_reqlof rfj]]\n {load rfc} {load rfe} {load rff} {load rfg} \n[msg_load rfg $err_evalabort]\n {load rfh} \n[msg_load rfh [err_reqmisf rfg]] \n[msg_top_load rfb {} rfk [list [list rfh rfg rff rfe rfc] [list rfc rfe rff rfh]] [err_depreunf rfd] [err_depref rfg]]]
testouterr_cmd_re sh {load --force rfb} $ans [join $tserr \n]

# crash in every mechanism (ReqLo, DepRe unload, DepRe load) (requirement expressed with 'module load', linked modules, middle one crashed)
Expand All @@ -372,7 +372,7 @@ lappend ans [list set _LMFILES_ $mp/rga:$mp/rgd:$mp/rgk:$mp/rgb:$mp/rgc:$mp/rge:
lappend ans [list set __MODULES_LMPREREQ rgd&rga|rgb&rgc:rgk&rgj:rgb&rgk:rgc&rga|rgb:rge&rga|rgb&rgd:rgf&rga|rgb:rgh&rga|rgb&rgg]
lappend ans [list set __MODULES_LMTAG rgk&auto-loaded]
lappend ans [list ERR]
set tserr [list {unload rgh} {unload rgg} {unload rgf} {unload rge} {unload rgd} \n[msg_unload rgd $err_evalabort]\n {unload rgc} {load rgb} {load rgk} {load rgj} {load rgi} \n[msg_load rgj $err_evalabort] \n[msg_load {rgk <aL>} [err_reqmisf rgj]]\n {load rgc} {load rge} {load rgf} {load rgg} \n[msg_load rgg $err_evalabort]\n {load rgh} \n[msg_load rgh [err_reqmisf rgg]] \n[msg_top_load rgb {} rgk [list [list rgh rgg rgf rge rgc] [list rgc rge rgf rgh]] [err_depreunf rgd] [err_reqlof rgj] [err_depref rgg]]]
set tserr [list {unload rgh} {unload rgg} {unload rgf} {unload rge} {unload rgd} \n[msg_unload rgd $err_evalabort]\n {unload rgc} {load rgb} {load rgk} {load rgj} {load rgi} \n[msg_load rgj $err_evalabort] \n[msg_load {rgk <aL>} [err_reqlof rgj]]\n {load rgc} {load rge} {load rgf} {load rgg} \n[msg_load rgg $err_evalabort]\n {load rgh} \n[msg_load rgh [err_reqmisf rgg]] \n[msg_top_load rgb {} rgk [list [list rgh rgg rgf rge rgc] [list rgc rge rgf rgh]] [err_depreunf rgd] [err_depref rgg]]]
testouterr_cmd_re sh {load --force rgb} $ans [join $tserr \n]


Expand Down Expand Up @@ -757,7 +757,7 @@ lappend ans [list set _LMFILES_ $mp/rfd:$mp/rfk:$mp/rfb:$mp/rfc:$mp/rfe:$mp/rff:
lappend ans [list set __MODULES_LMPREREQ rfd&rfa|rfb&rfc:rfk&rfj:rfb&rfk:rfc&rfa|rfb:rfe&rfa|rfb&rfd:rff&rfa|rfb:rfh&rfa|rfb&rfg]
lappend ans [list set __MODULES_LMTAG rfk&auto-loaded]
lappend ans [list ERR]
set tserr [list {unload rfh} {unload rfg} {unload rff} {unload rfe} {unload rfd} \n[msg_unload rfd $err_evalabort]\n {unload rfc} {unload rfa} {load rfb} {load rfk} {load rfj} {load rfi} \n[msg_load rfj $err_evalabort] \n[msg_load {rfk <aL>} [err_reqmisf rfj]]\n {load rfc} {load rfe} {load rff} {load rfg} \n[msg_load rfg $err_evalabort]\n {load rfh} \n[msg_load rfh [err_reqmisf rfg]] \n[msg_top_switch rfa rfb {} {} {} rfk [list [list rfh rfg rff rfe rfc] [list rfc rfe rff rfh]] [err_depreunf rfd] [err_reqlof rfj] [err_depref rfg]]]
set tserr [list {unload rfh} {unload rfg} {unload rff} {unload rfe} {unload rfd} \n[msg_unload rfd $err_evalabort]\n {unload rfc} {unload rfa} {load rfb} {load rfk} {load rfj} {load rfi} \n[msg_load rfj $err_evalabort] \n[msg_load {rfk <aL>} [err_reqlof rfj]]\n {load rfc} {load rfe} {load rff} {load rfg} \n[msg_load rfg $err_evalabort]\n {load rfh} \n[msg_load rfh [err_reqmisf rfg]] \n[msg_top_switch rfa rfb {} {} {} rfk [list [list rfh rfg rff rfe rfc] [list rfc rfe rff rfh]] [err_depreunf rfd] [err_depref rfg]]]
testouterr_cmd_re sh {switch --force rfa rfb} $ans [join $tserr \n]

# crash in every mechanism (ReqLo, DepRe unload, DepRe load) (linked modules, middle one crashed)
Expand All @@ -773,7 +773,7 @@ lappend ans [list set _LMFILES_ $mp/rgd:$mp/rgk:$mp/rgb:$mp/rgc:$mp/rge:$mp/rgf:
lappend ans [list set __MODULES_LMPREREQ rgd&rga|rgb&rgc:rgk&rgj:rgb&rgk:rgc&rga|rgb:rge&rga|rgb&rgd:rgf&rga|rgb:rgh&rga|rgb&rgg]
lappend ans [list set __MODULES_LMTAG rgk&auto-loaded]
lappend ans [list ERR]
set tserr [list {unload rgh} {unload rgg} {unload rgf} {unload rge} {unload rgd} \n[msg_unload rgd $err_evalabort]\n {unload rgc} {unload rga} {load rgb} {load rgk} {load rgj} {load rgi} \n[msg_load rgj $err_evalabort] \n[msg_load {rgk <aL>} [err_reqmisf rgj]]\n {load rgc} {load rge} {load rgf} {load rgg} \n[msg_load rgg $err_evalabort]\n {load rgh} \n[msg_load rgh [err_reqmisf rgg]] \n[msg_top_switch rga rgb {} {} {} rgk [list [list rgh rgg rgf rge rgc] [list rgc rge rgf rgh]] [err_depreunf rgd] [err_reqlof rgj] [err_depref rgg]]]
set tserr [list {unload rgh} {unload rgg} {unload rgf} {unload rge} {unload rgd} \n[msg_unload rgd $err_evalabort]\n {unload rgc} {unload rga} {load rgb} {load rgk} {load rgj} {load rgi} \n[msg_load rgj $err_evalabort] \n[msg_load {rgk <aL>} [err_reqlof rgj]]\n {load rgc} {load rge} {load rgf} {load rgg} \n[msg_load rgg $err_evalabort]\n {load rgh} \n[msg_load rgh [err_reqmisf rgg]] \n[msg_top_switch rga rgb {} {} {} rgk [list [list rgh rgg rgf rge rgc] [list rgc rge rgf rgh]] [err_depreunf rgd] [err_depref rgg]]]
testouterr_cmd_re sh {switch --force rga rgb} $ans [join $tserr \n]


Expand Down
4 changes: 2 additions & 2 deletions testsuite/modules.50-cmds/450-hidden-loaded.exp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ lappend ans [list set _LMFILES_ $mp/rag:$mp/rah]
lappend ans [list set LOADEDMODULES rag:rah]
lappend ans [list set __MODULES_LMTAG rag&hidden-loaded&auto-loaded]
lappend ans [list ERR]
testouterr_cmd_re sh {load --force -v --auto rah} $ans [msg_load {rae <aL>}]\n\n[msg_load raf $err_evalabort]\n\n[msg_load {rag <aL:H>} [err_reqmisf raf]]\n\n[msg_top_load rah {} rag {} [err_reqlof raf]]
testouterr_cmd_re sh {load --force -vv --auto rah} $ans [msg_load {rae <aL>}]\n\n[msg_load raf $err_evalabort]\n\n[msg_load {rag <aL:H>} [err_reqmisf raf]]\n\n[msg_top_load rah {} rag {} [err_reqlof raf]]
testouterr_cmd_re sh {load --force -v --auto rah} $ans [msg_load {rae <aL>}]\n\n[msg_load raf $err_evalabort]\n\n[msg_load {rag <aL:H>} [err_reqlof raf]]\n\n[msg_top_load rah {} rag {}]
testouterr_cmd_re sh {load --force -vv --auto rah} $ans [msg_load {rae <aL>}]\n\n[msg_load raf $err_evalabort]\n\n[msg_load {rag <aL:H>} [err_reqlof raf]]\n\n[msg_top_load rah {} rag {}]

setenv_loaded_module [list rae raf rag rah] [list $mp/rae $mp/raf $mp/rag $mp/rah] [list rae raf rag]
setenv_var __MODULES_LMTAG rae&auto-loaded:raf&hidden-loaded&auto-loaded:rag&hidden-loaded&auto-loaded
Expand Down

0 comments on commit 7509491

Please sign in to comment.