462-sticky-corner.exp (modules-5.1.1.tar.bz2) | : | 462-sticky-corner.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 76 | skipping to change at line 76 | |||
# test cumulative stickiness declarations | # test cumulative stickiness declarations | |||
setenv_loaded_module [list sticky/1.0] [list $mp/sticky/1.0] | setenv_loaded_module [list sticky/1.0] [list $mp/sticky/1.0] | |||
setenv_var __MODULES_LMTAG sticky/1.0&sticky | setenv_var __MODULES_LMTAG sticky/1.0&sticky | |||
setenv_var TESTSUITE_STICKY_GENERIC 2 | setenv_var TESTSUITE_STICKY_GENERIC 2 | |||
set tserr [msg_switch {sticky/1.0 <S>} sticky/2.0 $err_stickyunload] | set tserr [msg_switch {sticky/1.0 <S>} sticky/2.0 $err_stickyunload] | |||
testouterr_cmd_re sh {switch sticky/2.0} ERR $tserr | testouterr_cmd_re sh {switch sticky/2.0} ERR $tserr | |||
set tserr [msg_switch {sticky/1.0 <S>} sticky $err_stickyunload] | set tserr [msg_switch {sticky/1.0 <S>} sticky $err_stickyunload] | |||
testouterr_cmd_re sh {switch sticky} ERR $tserr | testouterr_cmd_re sh {switch sticky} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | lappend ans [list set _LMFILES_ $mp/sticky/2.0:$mp/foo/2.0] | |||
lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | lappend ans [list set LOADEDMODULES sticky/2.0:foo/2.0] | |||
lappend ans [list set __MODULES_LMTAG sticky/1.0&sticky:sticky/2.0&sticky] | lappend ans [list set __MODULES_LMTAG sticky/2.0&sticky] | |||
lappend ans [list ERR] | set tserr [msg_unload {sticky/1.0 <S>}]\n[msg_load {sticky/2.0 <S>}]\n[msg_load | |||
set tserr [msg_unload {sticky/1.0 <S>} $err_stickyunload]\n\n[msg_load {sticky/2 | foo/2.0] | |||
.0 <S>}]\n[msg_load foo/2.0] | ||||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/4.0:$mp/foo/2.0] | lappend ans [list set _LMFILES_ $mp/sticky/4.0:$mp/foo/2.0] | |||
lappend ans [list set LOADEDMODULES sticky/1.0:sticky/4.0:foo/2.0] | lappend ans [list set LOADEDMODULES sticky/4.0:foo/2.0] | |||
lappend ans [list set __MODULES_LMTAG sticky/1.0&sticky:sticky/4.0&sticky] | lappend ans [list set __MODULES_LMTAG sticky/4.0&sticky] | |||
lappend ans [list ERR] | set tserr [msg_unload {sticky/1.0 <S>}]\n[msg_load {sticky/4.0 <S>}]\n[msg_load | |||
set tserr [msg_unload {sticky/1.0 <S>} $err_stickyunload]\n\n[msg_load {sticky/4 | foo/2.0] | |||
.0 <S>}]\n[msg_load foo/2.0] | ||||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-5} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-5} $ans $tserr | |||
setenv_var TESTSUITE_SUPER_STICKY 1 | setenv_var TESTSUITE_SUPER_STICKY 1 | |||
setenv_var __MODULES_LMTAG sticky/1.0&super-sticky | setenv_var __MODULES_LMTAG sticky/1.0&super-sticky | |||
set tserr [msg_switch {sticky/1.0 <sS>} sticky $err_superstickyunload] | set tserr [msg_switch {sticky/1.0 <sS>} sticky $err_superstickyunload] | |||
testouterr_cmd_re sh {switch sticky} ERR $tserr | testouterr_cmd_re sh {switch sticky} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | |||
lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | |||
lappend ans [list set __MODULES_LMTAG sticky/1.0&super-sticky:sticky/2.0&super-s ticky] | lappend ans [list set __MODULES_LMTAG sticky/1.0&super-sticky:sticky/2.0&super-s ticky] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
set tserr [msg_unload {sticky/1.0 <sS>} $err_superstickyunload]\n\n[msg_load {st icky/2.0 <sS>}]\n[msg_load foo/2.0] | set tserr [msg_unload {sticky/1.0 <sS>} $err_superstickyunload]\n\n[msg_load {st icky/2.0 <sS>}]\n[msg_load foo/2.0] | |||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | |||
unsetenv_var TESTSUITE_SUPER_STICKY | unsetenv_var TESTSUITE_SUPER_STICKY | |||
setenv_var __MODULES_LMTAG sticky/1.0&sticky&super-sticky | setenv_var __MODULES_LMTAG sticky/1.0&sticky&super-sticky | |||
setenv_var TESTSUITE_STICKY_GENERIC 3 | setenv_var TESTSUITE_STICKY_GENERIC 3 | |||
set tserr [msg_switch {sticky/1.0 <S:sS>} sticky/2.0 $err_stickyunload] | set tserr [msg_switch {sticky/1.0 <S:sS>} sticky/2.0 $err_stickyunload] | |||
testouterr_cmd_re sh {switch sticky/2.0} ERR $tserr | testouterr_cmd_re sh {switch sticky/2.0} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | lappend ans [list set _LMFILES_ $mp/sticky/2.0:$mp/foo/2.0] | |||
lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | lappend ans [list set LOADEDMODULES sticky/2.0:foo/2.0] | |||
lappend ans [list set __MODULES_LMTAG sticky/1.0&sticky&super-sticky:sticky/2.0& | lappend ans [list set __MODULES_LMTAG sticky/2.0&super-sticky] | |||
super-sticky] | set tserr [msg_unload {sticky/1.0 <S:sS>}]\n[msg_load {sticky/2.0 <sS>}]\n[msg_l | |||
lappend ans [list ERR] | oad foo/2.0] | |||
set tserr [msg_unload {sticky/1.0 <S:sS>} $err_stickyunload]\n\n[msg_load {stick | ||||
y/2.0 <sS>}]\n[msg_load foo/2.0] | ||||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-4} $ans $tserr | |||
setenv_var TESTSUITE_STICKY_GENERIC 4 | setenv_var TESTSUITE_STICKY_GENERIC 4 | |||
set tserr [msg_switch {sticky/1.0 <S:sS>} sticky $err_superstickyunload] | set tserr [msg_switch {sticky/1.0 <S:sS>} sticky $err_superstickyunload] | |||
testouterr_cmd_re sh {switch sticky} ERR $tserr | testouterr_cmd_re sh {switch sticky} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | lappend ans [list set _LMFILES_ $mp/sticky/1.0:$mp/sticky/2.0:$mp/foo/2.0] | |||
lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | lappend ans [list set LOADEDMODULES sticky/1.0:sticky/2.0:foo/2.0] | |||
lappend ans [list set __MODULES_LMTAG sticky/1.0&sticky&super-sticky:sticky/2.0& sticky] | lappend ans [list set __MODULES_LMTAG sticky/1.0&sticky&super-sticky:sticky/2.0& sticky] | |||
lappend ans [list ERR] | lappend ans [list ERR] | |||
skipping to change at line 156 | skipping to change at line 153 | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S>} stickysub/dir1 $err_stickyunload] | set tserr [msg_switch {stickysub/dir1/1.0 <S>} stickysub/dir1 $err_stickyunload] | |||
testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0] | lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0] | |||
lappend ans [list set LOADEDMODULES stickysub/dir1/1.0] | lappend ans [list set LOADEDMODULES stickysub/dir1/1.0] | |||
lappend ans [list set __MODULES_LMTAG stickysub/dir1/1.0&sticky] | lappend ans [list set __MODULES_LMTAG stickysub/dir1/1.0&sticky] | |||
testouterr_cmd_re sh {switch stickysub/dir1/1.0} $ans {} | testouterr_cmd_re sh {switch stickysub/dir1/1.0} $ans {} | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S>} stickysub/dir1/2.0 $err_stickyunl oad] | set tserr [msg_switch {stickysub/dir1/1.0 <S>} stickysub/dir1/2.0 $err_stickyunl oad] | |||
testouterr_cmd_re sh {switch stickysub/dir1/2.0} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir1/2.0} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0:$mp/stickysub/dir2/4.0:$m | lappend ans [list set _LMFILES_ $mp/stickysub/dir2/4.0:$mp/foo/2.0] | |||
p/foo/2.0] | lappend ans [list set LOADEDMODULES stickysub/dir2/4.0:foo/2.0] | |||
lappend ans [list set LOADEDMODULES stickysub/dir1/1.0:stickysub/dir2/4.0:foo/2. | lappend ans [list unset __MODULES_LMTAG] | |||
0] | set tserr [msg_unload {stickysub/dir1/1.0 <S>}]\n[msg_load stickysub/dir2/4.0]\n | |||
lappend ans [list ERR] | [msg_load foo/2.0] | |||
set tserr [msg_unload {stickysub/dir1/1.0 <S>} $err_stickyunload]\n\n[msg_load s | ||||
tickysub/dir2/4.0]\n[msg_load foo/2.0] | ||||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | |||
setenv_var TESTSUITE_SUPER_STICKY 1 | setenv_var TESTSUITE_SUPER_STICKY 1 | |||
setenv_var __MODULES_LMTAG stickysub/dir1/1.0&super-sticky | setenv_var __MODULES_LMTAG stickysub/dir1/1.0&super-sticky | |||
set tserr [msg_switch {stickysub/dir1/1.0 <sS>} stickysub $err_superstickyunload ] | set tserr [msg_switch {stickysub/dir1/1.0 <sS>} stickysub $err_superstickyunload ] | |||
testouterr_cmd_re sh {switch stickysub} ERR $tserr | testouterr_cmd_re sh {switch stickysub} ERR $tserr | |||
set tserr [msg_switch {stickysub/dir1/1.0 <sS>} stickysub/dir1 $err_superstickyu nload] | set tserr [msg_switch {stickysub/dir1/1.0 <sS>} stickysub/dir1 $err_superstickyu nload] | |||
testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0] | lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0] | |||
skipping to change at line 215 | skipping to change at line 212 | |||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | |||
setenv_var TESTSUITE_STICKY_GENERIC 8 | setenv_var TESTSUITE_STICKY_GENERIC 8 | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub $err_stickyunload] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub $err_stickyunload] | |||
testouterr_cmd_re sh {switch stickysub} ERR $tserr | testouterr_cmd_re sh {switch stickysub} ERR $tserr | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir1/2.0 $err_sticky unload] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir1/2.0 $err_sticky unload] | |||
testouterr_cmd_re sh {switch stickysub/dir1/2.0} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir1/2.0} ERR $tserr | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir2 $err_stickyunlo ad] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir2 $err_stickyunlo ad] | |||
testouterr_cmd_re sh {switch stickysub/dir2} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir2} ERR $tserr | |||
set ans [list] | set ans [list] | |||
lappend ans [list set _LMFILES_ $mp/stickysub/dir1/1.0:$mp/stickysub/dir2/4.0:$m | lappend ans [list set _LMFILES_ $mp/stickysub/dir2/4.0:$mp/foo/2.0] | |||
p/foo/2.0] | lappend ans [list set LOADEDMODULES stickysub/dir2/4.0:foo/2.0] | |||
lappend ans [list set LOADEDMODULES stickysub/dir1/1.0:stickysub/dir2/4.0:foo/2. | lappend ans [list set __MODULES_LMTAG stickysub/dir2/4.0&super-sticky] | |||
0] | set tserr [msg_unload {stickysub/dir1/1.0 <S:sS>}]\n[msg_load {stickysub/dir2/4. | |||
lappend ans [list set __MODULES_LMTAG stickysub/dir1/1.0&sticky&super-sticky:sti | 0 <sS>}]\n[msg_load foo/2.0] | |||
ckysub/dir2/4.0&super-sticky] | ||||
lappend ans [list ERR] | ||||
set tserr [msg_unload {stickysub/dir1/1.0 <S:sS>} $err_stickyunload]\n\n[msg_loa | ||||
d {stickysub/dir2/4.0 <sS>}]\n[msg_load foo/2.0] | ||||
testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | testouterr_cmd_re sh {restore testsuite/home/coll-sticky-6} $ans $tserr | |||
setenv_var TESTSUITE_STICKY_GENERIC 9 | setenv_var TESTSUITE_STICKY_GENERIC 9 | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub $err_superstickyunlo ad] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub $err_superstickyunlo ad] | |||
testouterr_cmd_re sh {switch stickysub} ERR $tserr | testouterr_cmd_re sh {switch stickysub} ERR $tserr | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir1 $err_superstick yunload] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir1 $err_superstick yunload] | |||
testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir1} ERR $tserr | |||
set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir2/3.0 $err_supers tickyunload] | set tserr [msg_switch {stickysub/dir1/1.0 <S:sS>} stickysub/dir2/3.0 $err_supers tickyunload] | |||
testouterr_cmd_re sh {switch stickysub/dir2/3.0} ERR $tserr | testouterr_cmd_re sh {switch stickysub/dir2/3.0} ERR $tserr | |||
set ans [list] | set ans [list] | |||
End of changes. 5 change blocks. | ||||
35 lines changed or deleted | 25 lines changed or added |