Skip to content

Commit

Permalink
ts: adapt tests for held not found module error message
Browse files Browse the repository at this point in the history
  • Loading branch information
@xdelaruelle
xdelaruelle committed Sep 12, 2023
1 parent 6e89a61 commit 390a5f7
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 24 deletions.
22 changes: 9 additions & 13 deletions testsuite/modules.50-cmds/550-optional-opt.exp
View file
Expand Up @@ -300,7 +300,7 @@ lappend ans [list set _LMFILES_ $mp/bar/1.0:$modfile]
lappend ans [list set LOADEDMODULES bar/1.0:$mod]
lappend ans [list set __MODULES_LMEXTRATAG bar/1.0&foo]
lappend ans [list set __MODULES_LMTAG bar/1.0&foo&auto-loaded]
set tserr [msg_top_load $mod {} bar/1.0 {} $err_path'unk/1.0']
set tserr [msg_top_load $mod {} bar/1.0 {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr

set ans [list]
Expand All @@ -318,7 +318,7 @@ lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|bar/1.0]
lappend ans [list set _LMFILES_ $mp/bar/1.0:$modfile]
lappend ans [list set LOADEDMODULES bar/1.0:$mod]
lappend ans [list set __MODULES_LMTAG bar/1.0&auto-loaded]
set tserr [msg_top_load $mod {} {bar/1.0} {} $err_path'unk/1.0']
set tserr [msg_top_load $mod {} {bar/1.0} {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr

set ans [list]
Expand All @@ -334,7 +334,7 @@ lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|bar/1.0]
lappend ans [list set _LMFILES_ $mp/bar/1.0:$modfile]
lappend ans [list set LOADEDMODULES bar/1.0:$mod]
lappend ans [list set __MODULES_LMTAG bar/1.0&auto-loaded]
set tserr [msg_top_load $mod {} {bar/1.0} {} $err_path'unk/1.0']
set tserr [msg_top_load $mod {} {bar/1.0} {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr

set ans [list]
Expand All @@ -351,7 +351,7 @@ lappend ans [list set _LMFILES_ $mp/bar/1.0:$modfile]
lappend ans [list set LOADEDMODULES bar/1.0:$mod]
lappend ans [list set __MODULES_LMEXTRATAG bar/1.0&foo]
lappend ans [list set __MODULES_LMTAG bar/1.0&foo&keep-loaded&auto-loaded]
set tserr [msg_top_load $mod {} {bar/1.0} {} $err_path'unk/1.0']
set tserr [msg_top_load $mod {} {bar/1.0} {}]
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd sh "load --no-auto $mod" $ans $tserr

Expand All @@ -363,8 +363,7 @@ set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0|foo/1.0]
lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod]
set tserr [msg_load $mod $err_path'unk/1.0']
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd sh "load --auto $mod" $ans {}

set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0|foo/1.0]
Expand All @@ -380,8 +379,7 @@ set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|foo/1.0]
lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod]
set tserr [msg_load $mod $err_path'unk/1.0']
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd sh "load --auto $mod" $ans {}

set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|foo/1.0]
Expand All @@ -395,8 +393,7 @@ set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|foo/1.0]
lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod]
set tserr [msg_load $mod $err_path'unk/1.0']
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd sh "load --auto $mod" $ans {}

set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|foo/1.0]
Expand All @@ -410,9 +407,8 @@ set ans [list]
lappend ans [list set __MODULES_LMPREREQ $mod&$mod|unk/1.0&$mod|foo/1.0]
lappend ans [list set _LMFILES_ $modfile]
lappend ans [list set LOADEDMODULES $mod]
set tserr [msg_load $mod $err_path'unk/1.0']
testouterr_cmd sh "load --auto $mod" $ans $tserr
testouterr_cmd sh "load --no-auto $mod" $ans $tserr
testouterr_cmd sh "load --auto $mod" $ans {}
testouterr_cmd sh "load --no-auto $mod" $ans {}


# wrongly positioned --optional argument
Expand Down
22 changes: 11 additions & 11 deletions testsuite/modules.70-maint/273-adv_version_spec-space.exp
View file
Expand Up @@ -117,14 +117,14 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.0&sp.ce|y+@2.5<2.7|baz @<1"
lappend ans [list set _LMFILES_ "$mp/baz/1:$mp/space ye/1.0"]
lappend ans [list set LOADEDMODULES "baz/1:space ye/1.0"]
lappend ans [list set __MODULES_LMTAG "baz/1&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye@1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/1 {} $err_path'sp.ce' $err_path'y\\+@2.5:2.7']
testouterr_cmd_re sh {load --auto space\ ye@1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/1 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.1&sp.ce|y+ @2.5<2.7|baz @<1"]
lappend ans [list set _LMFILES_ "$mp/baz/1:$mp/space ye/1.1"]
lappend ans [list set LOADEDMODULES "baz/1:space ye/1.1"]
lappend ans [list set __MODULES_LMTAG "baz/1&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye@1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/1 {} $err_path'sp.ce' "$err_path'y\\+ @2.5:2.7'"]
testouterr_cmd_re sh {load --auto space\ ye@1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/1 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.2&{sp.ce y+} @2.5<2.7|baz @<1"]
Expand Down Expand Up @@ -191,14 +191,14 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.0&sp.ce|y+@2.5<2.7|baz @<1"
lappend ans [list set _LMFILES_ "$mp/sp.ce y+/2.7:$mp/baz/1:$mp/space ye/1.0"]
lappend ans [list set LOADEDMODULES "sp.ce y+/2.7:baz/1:space ye/1.0"]
lappend ans [list set __MODULES_LMTAG "baz/1&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye@1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/1 {} $err_path'sp.ce' $err_path'y\\+@2.5:2.7']
testouterr_cmd_re sh {load --auto space\ ye@1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/1 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.1&sp.ce|y+ @2.5<2.7|baz @<1"]
lappend ans [list set _LMFILES_ "$mp/sp.ce y+/2.7:$mp/baz/1:$mp/space ye/1.1"]
lappend ans [list set LOADEDMODULES "sp.ce y+/2.7:baz/1:space ye/1.1"]
lappend ans [list set __MODULES_LMTAG "baz/1&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye@1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/1 {} $err_path'sp.ce' "$err_path'y\\+ @2.5:2.7'"]
testouterr_cmd_re sh {load --auto space\ ye@1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/1 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.2&{sp.ce y+} @2.5<2.7|baz @<1"]
Expand Down Expand Up @@ -753,14 +753,14 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.0&sp.ce|y+@2.5<2.7|baz|@<1"
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.0"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.0"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/2 {} $err_path'sp.ce' $err_path'y\\+@2.5:2.7']
testouterr_cmd_re sh {load --auto space\ ye/1.0} $ans [msg_top_load {'space ye/1.0'} {} baz/2 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.1&sp.ce|y+|@2.5<2.7|baz|@<1"]
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.1"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.1"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/2 {} $err_path'sp.ce' "$err_path'y\\+'" "$err_path'@2.5:2.7'"]
testouterr_cmd_re sh {load --auto space\ ye/1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/2 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.2&{sp.ce y+}|@2.5<2.7|baz|@<1"]
Expand All @@ -781,7 +781,7 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.4&{sp.ce y+@1.2}|@2.5<2.7|b
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.4"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.4"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.4} $ans [msg_top_load {'space ye/1.4'} {} {baz/2} {} "$err_path'{sp.ce y\\+@1.2}'" "$err_path'@2.5:2.7'"]
testouterr_cmd_re sh {load --auto space\ ye/1.4} $ans [msg_top_load {'space ye/1.4'} {} {baz/2} {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.5&{sp.ce y+}|@1.2|@2.5<2.7|baz|@<1"]
Expand All @@ -802,21 +802,21 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.7&{sp.ce y+@0 2}|baz|@<1"]
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.7"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.7"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.7} $ans [msg_top_load {'space ye/1.7'} {} {baz/2} {} "$err_path'{sp.ce y\\+@0 2}'"]
testouterr_cmd_re sh {load --auto space\ ye/1.7} $ans [msg_top_load {'space ye/1.7'} {} {baz/2} {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.8&{space y @1 }|baz|@<1"]
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.8"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.8"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.8} $ans [msg_top_load {'space ye/1.8'} {} {baz/2} {} "$err_path'{space y @1 }'"]
testouterr_cmd_re sh {load --auto space\ ye/1.8} $ans [msg_top_load {'space ye/1.8'} {} {baz/2} {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.9&{space y @a }|baz|@<1"]
lappend ans [list set _LMFILES_ "$mp/baz/2:$mp/space ye/1.9"]
lappend ans [list set LOADEDMODULES "baz/2:space ye/1.9"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.9} $ans [msg_top_load {'space ye/1.9'} {} {baz/2} {} "$err_path'{space y @a }'"]
testouterr_cmd_re sh {load --auto space\ ye/1.9} $ans [msg_top_load {'space ye/1.9'} {} {baz/2} {}]

setenv_loaded_module [list {sp.ce y+/2.7}] [list "$mp/sp.ce y+/2.7"]

Expand All @@ -825,7 +825,7 @@ lappend ans [list set __MODULES_LMPREREQ "space ye/1.1&sp.ce|y+|@2.5<2.7|baz|@<1
lappend ans [list set _LMFILES_ "$mp/sp.ce y+/2.7:$mp/baz/2:$mp/space ye/1.1"]
lappend ans [list set LOADEDMODULES "sp.ce y+/2.7:baz/2:space ye/1.1"]
lappend ans [list set __MODULES_LMTAG "baz/2&auto-loaded"]
testouterr_cmd_re sh {load --auto space\ ye/1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/2 {} $err_path'sp.ce' "$err_path'y\\+'" "$err_path'@2.5:2.7'"]
testouterr_cmd_re sh {load --auto space\ ye/1.1} $ans [msg_top_load {'space ye/1.1'} {} baz/2 {}]

set ans [list]
lappend ans [list set __MODULES_LMPREREQ "space ye/1.5&{sp.ce y+}|@1.2|@2.5<2.7|baz|@<1"]
Expand Down

0 comments on commit 390a5f7

Please sign in to comment.