diff --git a/testsuite/modules.50-cmds/460-sticky.exp b/testsuite/modules.50-cmds/460-sticky.exp index 373185cf7..cc651b42a 100644 --- a/testsuite/modules.50-cmds/460-sticky.exp +++ b/testsuite/modules.50-cmds/460-sticky.exp @@ -497,10 +497,6 @@ setenv_var __MODULES_LMSTICKYRULE sticky/1.0&sticky|sticky set tserr [msg_unload {sticky/1.0 } $err_stickyunload]\n\n[msg_switch {sticky/1.0 } sticky/99 [err_swoff sticky/1.0] $err_path'sticky/99'] testouterr_cmd_re sh {switch --auto sticky/99} ERR $tserr - -set tserr "[msg_unload {sticky/1.0 } [err_prerequn bar/2.0]] - -[msg_switch {sticky/1.0 } sticky/99 [err_swoff sticky/1.0] $err_path'sticky/99']" testouterr_cmd_re sh {switch --no-auto sticky/99} ERR $tserr set ans [list] @@ -522,7 +518,7 @@ lappend ans [list set _LMFILES_ $mp/foo/2.0:$mp/bar/2.0] lappend ans [list set LOADEDMODULES foo/2.0:bar/2.0] lappend ans [list unset __MODULES_LMTAG] lappend ans [list ERR] -set tserr "[msg_unload {sticky/1.0 } [err_deplof bar/2.0] $err_stickyunloadf] +set tserr "[msg_unload {sticky/1.0 } $err_stickyunloadf [err_deplof bar/2.0]] [msg_switch {sticky/1.0 } sticky/99 $err_path'sticky/99']" testouterr_cmd_re sh {switch --no-auto -f sticky/99} $ans $tserr diff --git a/testsuite/modules.50-cmds/461-super-sticky.exp b/testsuite/modules.50-cmds/461-super-sticky.exp index c843de744..56d00ca58 100644 --- a/testsuite/modules.50-cmds/461-super-sticky.exp +++ b/testsuite/modules.50-cmds/461-super-sticky.exp @@ -398,15 +398,7 @@ setenv_var __MODULES_LMPREREQ sticky/1.0&foo|baz:bar/2.0&sticky/1.0 testouterr_cmd_re sh {switch --auto sticky/99} ERR $tserr testouterr_cmd_re sh {switch --auto -f sticky/1.0 sticky/99} ERR $tserr - -set tserr "[msg_unload {sticky/1.0 } [err_prerequn bar/2.0]] - -[msg_switch {sticky/1.0 } sticky/99 [err_swoff sticky/1.0] $err_path'sticky/99']" testouterr_cmd_re sh {switch --no-auto sticky/99} ERR $tserr - -set tserr "[msg_unload {sticky/1.0 } [err_deplof bar/2.0] $err_superstickyunload] - -[msg_switch {sticky/1.0 } sticky/99 [err_swoff sticky/1.0] $err_path'sticky/99']" testouterr_cmd_re sh {switch --no-auto -f sticky/99} ERR $tserr # switch sticky module within modulefile to a module that does not exist (generic sticky) diff --git a/testsuite/modules.50-cmds/462-sticky-corner.exp b/testsuite/modules.50-cmds/462-sticky-corner.exp index 0f4792c90..deffe75ee 100644 --- a/testsuite/modules.50-cmds/462-sticky-corner.exp +++ b/testsuite/modules.50-cmds/462-sticky-corner.exp @@ -429,7 +429,7 @@ unsetenv_loaded_module unsetenv_var __MODULES_LMTAG setenv_var TESTSUITE_STICKY 1 -set tserr [msg_unload {sticky2/1.0 } [err_deploi sticky3/1.0]]\n\n[msg_unload {sticky1/1.0 } [err_depun sticky2/1.0]]\n\n[msg_load sticky3/1.0 [err_conun sticky1/1.0]] +set tserr [msg_unload {sticky1/1.0 } $err_stickyunload]\n\n[msg_load sticky3/1.0 [err_conun sticky1/1.0]] testouterr_cmd_re sh {load --auto sticky3/1.0} ERR $tserr setenv_var TESTSUITE_STICKY 2 @@ -446,6 +446,7 @@ testouterr_cmd_re sh {load --auto sticky3/1.0} ERR $tserr setenv_var TESTSUITE_STICKY 7 # switched-on module is now resolved prior testing stickiness is preserved +set tserr [msg_unload {sticky2/1.0 } [err_deploi sticky3/1.0]]\n\n[msg_unload {sticky1/1.0 } [err_depun sticky2/1.0]]\n\n[msg_load sticky3/1.0 [err_conun sticky1/1.0]] testouterr_cmd_re sh {load --auto sticky3/1.0} ERR $tserr setenv_var TESTSUITE_STICKY 8 @@ -456,7 +457,7 @@ lappend ans [list set LOADEDMODULES sticky0:sticky2/1.0] lappend ans [list set __MODULES_LMTAG sticky0&auto-loaded&sticky] set tserr [msg_top_load sticky2/1.0 {} {sticky0} {}] testouterr_cmd_re sh {load --auto sticky2/1.0} $ans $tserr -set tserr [msg_unload {sticky2/1.0 } [err_deploi sticky3/1.0]]\n\n[msg_unload {sticky0 } [err_depun sticky2/1.0]]\n\n[msg_load sticky3/1.0 [err_conun sticky0]] +set tserr [msg_unload {sticky0 } $err_stickyunload]\n\n[msg_load sticky3/1.0 [err_conun sticky0]] testouterr_cmd_re sh {load --auto sticky3/1.0} ERR $tserr setenv_var TESTSUITE_STICKY 9 @@ -468,7 +469,7 @@ lappend ans [list set __MODULES_LMTAG sticky4/sub/1.0&auto-loaded&sticky] set tserr [msg_top_load sticky2/1.0 {} {sticky4/sub/1.0} {}] testouterr_cmd_re sh {load --auto sticky2/1.0} $ans $tserr -set tserr [msg_unload {sticky2/1.0 } [err_deploi sticky3/1.0]]\n\n[msg_unload {sticky4/sub/1.0 } [err_depun sticky2/1.0]]\n\n[msg_load sticky3/1.0 [err_conun sticky4/sub/1.0]] +set tserr [msg_unload {sticky4/sub/1.0 } $err_stickyunload]\n\n[msg_load sticky3/1.0 [err_conun sticky4/sub/1.0]] testouterr_cmd_re sh {load --auto sticky3/1.0} ERR $tserr setenv_var TESTSUITE_STICKY 10