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 5 Packages Projects Releases Wiki Activity

ts: update reference to renamed __MODULES_SHARE_* vars

Browse Source
This commit is contained in:
Xavier Delaruelle
2021-08-07 14:55:11 +02:00
parent fe18da1c2e
commit c22294f0f2
36 changed files with 285 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testsuite/config/base-config.exp
View File

@@ -599,7 +599,7 @@ proc shell_out {test_shell out_list {re_mode 0}} {
lappend answer_list $envvar($var)
# automatically set ref counter variable if not specified
set sharevar "${var}_modshare"
set sharevar __MODULES_SHARE_$var
if {![info exists envvar($sharevar)]} {
if {$re_mode} {
set envvar($sharevar) [shell_set $test_shell $sharevar "(.*)" $re_mode]
@@ -624,7 +624,7 @@ proc shell_out {test_shell out_list {re_mode 0}} {
lappend answer_list $envvar($var)
# automatically set ref counter variable if not specified
set sharevar "${var}_modshare"
set sharevar __MODULES_SHARE_$var
if {![info exists envvar($sharevar)]} {
set envvar($sharevar) [shell_unset $test_shell $sharevar $re_mode]
set autovar($sharevar) 1
@@ -1203,7 +1203,7 @@ proc unsetenv_var {var} {
proc unsetenv_path_var {var} {
unsetenv_var $var
# unset reference counter variable
unsetenv_var "${var}_modshare"
unsetenv_var __MODULES_SHARE_$var
}
proc setenv_var {var val} {
@@ -1224,7 +1224,7 @@ proc setenv_path_var {var args} {
incr refcnt($arg)
}
}
setenv_var "${var}_modshare" [join [array get refcnt] ":"]
setenv_var __MODULES_SHARE_$var [join [array get refcnt] ":"]
}
proc unsetenv_loaded_module {} {

8
testsuite/install.00-init/010-environ.exp
View File

@@ -46,9 +46,9 @@ catch {unset env(____MODULES_LMVARIANT)}
catch {unset env(MODULES_RUN_QUARANTINE)}
foreach var [array names env] {
if {[string match "*_modshare" $var] \
|| [string match "__MODULES_QUAR_*" $var] \
|| [string match "MODULES_RUNENV_*" $var]} {
if {[string match __MODULES_SHARE_* $var] \
|| [string match __MODULES_QUAR_* $var] \
|| [string match MODULES_RUNENV_* $var]} {
catch {unset env($var)}
}
}
@@ -83,7 +83,7 @@ catch {unset env(MODULES_SET_SHELL_STARTUP)}
# clean any shells defined to get ksh fpath set
catch {unset env(MODULES_SHELLS_WITH_KSH_FPATH)}
catch {unset env(FPATH)}
catch {unset env(FPATH_modshare)}
catch {unset env(__MODULES_SHARE_FPATH)}
# clean any pager configuration
catch {unset env(LESS)}

8
testsuite/modules.00-init/010-environ.exp
View File

@@ -49,9 +49,9 @@ catch {unset env(MODULECONTACT)}
catch {unset env(MODULES_RUN_QUARANTINE)}
foreach var [array names env] {
if {[string match "*_modshare" $var] \
|| [string match "__MODULES_QUAR_*" $var] \
|| [string match "MODULES_RUNENV_*" $var]} {
if {[string match __MODULES_SHARE_* $var] \
|| [string match __MODULES_QUAR_* $var] \
|| [string match MODULES_RUNENV_* $var]} {
catch {unset env($var)}
}
}
@@ -80,7 +80,7 @@ catch {unset env(MODULES_SET_SHELL_STARTUP)}
# clean any shells defined to get ksh fpath set
catch {unset env(MODULES_SHELLS_WITH_KSH_FPATH)}
catch {unset env(FPATH)}
catch {unset env(FPATH_modshare)}
catch {unset env(__MODULES_SHARE_FPATH)}
# clean any pager configuration
catch {unset env(LESS)}

6
testsuite/modules.00-init/120-siteconfig.exp
View File

@@ -321,7 +321,7 @@ if { $verbose > 0 } {
set env(TESTSUITE_ENABLE_SITECONFIG_WINDOWS_PLATFORM) 1
set env(PATH) "/path/to/dir1"
set env(PATH_modshare) "/path/to/dir1;1"
set env(__MODULES_SHARE_PATH) "/path/to/dir1;1"
set module "append/2.0"
set modulefile "$modpath/$module"
@@ -329,11 +329,11 @@ set ans [list]
lappend ans [list setpath PATH "/path/to/dir1;/this/is/the/modules/testsuite"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set PATH_modshare "/path/to/dir1;1;/this/is/the/modules/testsuite;1"]
lappend ans [list set __MODULES_SHARE_PATH "/path/to/dir1;1;/this/is/the/modules/testsuite;1"]
testouterr_cmd "cmd" "load $module" $ans ""
set env(PATH) $ORIG_PATH
unset env(PATH_modshare)
unset env(__MODULES_SHARE_PATH)
# restore environment
if { $verbose > 0 } {

2
testsuite/modules.10-use/030-use.exp
View File

@@ -89,7 +89,7 @@ setenv_path_var MODULEPATH $modpath
# re-export and increase reference count (C version does no modification)
#
set ans [list]
lappend ans [list set MODULEPATH_modshare "$loaded_path:2"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$loaded_path:2"]
lappend ans [list set MODULEPATH $loaded_path]
test_cmd "ALL" "$use $loaded_path" $ans

2
testsuite/modules.10-use/031-append.exp
View File

@@ -65,7 +65,7 @@ setenv_path_var MODULEPATH $modpath
# re-export and increase reference count (C version does no modification)
#
set ans [list]
lappend ans [list set MODULEPATH_modshare "$loaded_path:2"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$loaded_path:2"]
lappend ans [list set MODULEPATH $loaded_path]
test_cmd "ALL" "$use $loaded_path" $ans

2
testsuite/modules.10-use/032-prepend.exp
View File

@@ -65,7 +65,7 @@ setenv_path_var MODULEPATH $modpath
# re-export and increase reference count (C version does no modification)
#
set ans [list]
lappend ans [list set MODULEPATH_modshare "$loaded_path:2"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$loaded_path:2"]
lappend ans [list set MODULEPATH $loaded_path]
test_cmd "ALL" "$use $loaded_path" $ans

6
testsuite/modules.10-use/070-unuse.exp
View File

@@ -98,16 +98,16 @@ testouterr_cmd "ALL" "$use" "OK" "$path_list_header\n $path\n $modpath"
# test removing dir enabled multiple times
#
setenv_var MODULEPATH_modshare "$path:2:$modpath:1"
setenv_var __MODULES_SHARE_MODULEPATH "$path:2:$modpath:1"
# dir not removed if ref counter > 1, should be changed in next major version
# as commands sends from the command-line should by-pass any ref counter
set ans [list]
lappend ans [list set MODULEPATH_modshare "$path:1:$modpath:1"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$path:1:$modpath:1"]
lappend ans [list set MODULEPATH "$path:$modpath"]
testouterr_cmd "sh" "$use $path" $ans "$warn_msgs: Did not unuse $path"
unsetenv_var MODULEPATH_modshare
unsetenv_var __MODULES_SHARE_MODULEPATH
# list paths with no paths set

2
testsuite/modules.10-use/080-access-use.exp
View File

@@ -46,7 +46,7 @@ unsetenv_path_var MODULEPATH
change_file_perms $modpath $hide_perms
# normal enabling, as no directory access
lappend ans [list set MODULEPATH_modshare "$modpath:1"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$modpath:1"]
lappend ans [list set MODULEPATH $modpath]
testouterr_cmd "sh" "use $modpath" $ans ""

6
testsuite/modules.50-cmds/028-setenv-refcount.exp
View File

@@ -41,9 +41,9 @@ set modulefile3 "$modpath/$module3"
# test load mode
#
lappend ans [list unset testsuite_modshare]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list unset __MODULES_SHARE_testsuite]
lappend ans [list set testsuite yes]
test_cmd "ALL" "load $module" $ans
@@ -52,19 +52,19 @@ test_cmd "ALL" "load $module" $ans
setenv_var TS1 "no"
set ans [list]
lappend ans [list unset __MODULES_SHARE_TS1]
lappend ans [list set TS1 maybe]
lappend ans [list set _LMFILES_ $modulefile2]
lappend ans [list set LOADEDMODULES $module2]
lappend ans [list unset TS1_modshare]
# setenv after append-path: an unset order for ref counter variable is produced
test_cmd "sh" "load $module2" $ans
set ans [list]
lappend ans [list set __MODULES_SHARE_TS1 "yes:1:maybe:1"]
lappend ans [list set TS1 "maybe:yes"]
lappend ans [list set _LMFILES_ $modulefile3]
lappend ans [list set LOADEDMODULES $module3]
lappend ans [list set TS1_modshare "yes:1:maybe:1"]
# append-path after setenv: an set order for ref counter variable is produced
test_cmd "sh" "load $module3" $ans

2
testsuite/modules.50-cmds/038-unsetenv-refcount.exp
View File

@@ -43,9 +43,9 @@ set env(testsuite) "'yes'"
# For the different shells ...
#
lappend ans [list unset testsuite_modshare]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list unset __MODULES_SHARE_testsuite]
lappend ans [list unset testsuite]

62
testsuite/modules.50-cmds/040-append.exp
View File

@@ -144,14 +144,14 @@ set module "append/2.3"
set modulefile "$modpath/$module"
set old_path "/path/to/dir1"
set env(FOO_modshare) "$old_path:1"
set env(__MODULES_SHARE_FOO) "$old_path:1"
set env(FOO) $old_path
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO "$old_path:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -163,10 +163,10 @@ set module "append/2.4"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO "$old_path:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -177,43 +177,43 @@ testouterr_cmd "sh" "load $module" $ans ""
set module "append/4.0"
set modulefile "$modpath/$module"
unset env(FOO_modshare)
unset env(__MODULES_SHARE_FOO)
unset env(FOO)
set env(BAR_modshare) "/path/to/dir1:2:/path/to/dir2:1"
set env(__MODULES_SHARE_BAR) "/path/to/dir1:2:/path/to/dir2:1"
set env(BAR) "/path/to/dir1:/path/to/dir2:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set BAR_modshare "/path/to/dir1:3:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO) "/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set BAR_modshare "/path/to/dir1:3:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:2"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2"
set env(FOO) "/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:4:/path/to/dir2:1"]
lappend ans [list set BAR_modshare "/path/to/dir1:3:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -221,12 +221,12 @@ set module "append/4.1"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:4:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set __MODULES_SHARE_BAR "/path/to/dir1:3:/path/to/dir2:1"]
lappend ans [list set BAR "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:4:/path/to/dir2:1"]
lappend ans [list set BAR_modshare "/path/to/dir1:3:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans [msg_load $module "$warn_msgs: --index option has no effect on add-path"]
@@ -248,7 +248,7 @@ set bigpathtrunclen [expr {3999 - ([string length $bigpathvalesc] - [string leng
set module "append/5.0"
set modulefile "$modpath/$module"
unset env(FOO_modshare)
unset env(__MODULES_SHARE_FOO)
unset env(FOO)
set ans [list]
@@ -267,10 +267,10 @@ lappend ans [list setpath PATH "[string range $bigpathval 0 $bigpathtrunclen]:/u
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set _LMFILES_ $modulefile]
set ts_err "$warn_msgs: FOO exceeds 4000 characters, truncating...
$warn_msgs: PATH exceeds 4000 characters, truncating and appending /usr/bin:/bin ...
$warn_msgs: FOO_modshare exceeds 4000 characters, truncating...
$warn_msgs: PATH_modshare exceeds 4000 characters, truncating..."
set ts_err "$warn_msgs: __MODULES_SHARE_FOO exceeds 4000 characters, truncating...
$warn_msgs: FOO exceeds 4000 characters, truncating...
$warn_msgs: __MODULES_SHARE_PATH exceeds 4000 characters, truncating...
$warn_msgs: PATH exceeds 4000 characters, truncating and appending /usr/bin:/bin ..."
testouterr_cmd_re "csh" "load $module" $ans $ts_err
@@ -282,14 +282,14 @@ testouterr_cmd_re "csh" "load $module" $ans $ts_err
set module "append/6.0"
set modulefile "$modpath/$module"
set env(FOO_modshare) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
set env(FOO) "/path/to/dir1:/path/to/dir4"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir4:1:/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir4:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir4:1:/path/to/dir1:2:/path/to/dir2:1"]
# reference counter is automatically ajusted
testouterr_cmd "sh" "load $module" $ans {}
@@ -297,10 +297,10 @@ testouterr_cmd "sh" "load $module" $ans {}
# test incoherent state on unload mode
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir4:1"]
lappend ans [list set FOO "/path/to/dir4"]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set FOO_modshare "/path/to/dir4:1"]
testouterr_cmd "sh" "unload $module" $ans {}
@@ -309,14 +309,14 @@ testouterr_cmd "sh" "unload $module" $ans {}
#
unsetenv_loaded_module
set env(FOO_modshare) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir2:1:/path/to/dir3:2:/path/to/dir4:1"
unset env(FOO)
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1:/path/to/dir2:1"]
# reference counter is automatically ajusted
testouterr_cmd "sh" "load $module" $ans {}
@@ -324,10 +324,10 @@ testouterr_cmd "sh" "load $module" $ans {}
# test incoherent state on unload mode
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module" $ans {}
@@ -336,14 +336,14 @@ testouterr_cmd "sh" "unload $module" $ans {}
#
unsetenv_loaded_module
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir3"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir3"
set env(FOO) "/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:2:/path/to/dir2:1"]
# reference counter ignored
testouterr_cmd "sh" "load $module" $ans ""
@@ -351,10 +351,10 @@ testouterr_cmd "sh" "load $module" $ans ""
# test incoherent state on unload mode
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module" $ans {}
@@ -363,14 +363,14 @@ testouterr_cmd "sh" "unload $module" $ans {}
#
unsetenv_loaded_module
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir3"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir3"
unset env(FOO)
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1:/path/to/dir2:1"]
# reference counter is automatically ajusted
testouterr_cmd "sh" "load $module" $ans {}
@@ -378,10 +378,10 @@ testouterr_cmd "sh" "load $module" $ans {}
# test incoherent state on unload mode
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module" $ans {}

10
testsuite/modules.50-cmds/042-append-delim.exp
View File

@@ -33,10 +33,10 @@ set ts_1 "http://foobar.org"
set ts_2 "http://foobar.net"
set ts_3 "http://foobar.com"
set ts_new "$ts_1 $ts_2 $ts_3"
# test colon char is correctly escaped in _modshare var
# test colon char is correctly escaped in __MODULES_SHARE_ var
set tsmod_new "http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.org:1"
set env(testsuite) "$ts_1 $ts_2"
set env(testsuite_modshare) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.org:1:http\\://foobar.net:1"
set module "append/1.0"
set modulefile "$modpath/$module"
@@ -44,9 +44,9 @@ set modulefile "$modpath/$module"
# For the different shells ...
#
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
#
@@ -92,9 +92,9 @@ set ts_new "$ts_1 $ts_2 $ts_3 http://foobar.io "
set tsmod_new ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""
@@ -107,9 +107,9 @@ set module "append/1.7"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""

6
testsuite/modules.50-cmds/045-append-undo.exp
View File

@@ -172,15 +172,15 @@ unsetenv_path_var testsuite2
set module "append/2.3"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(FOO) "/path/to/dir1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
lappend ans [list set FOO "/path/to/dir1"]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set FOO_modshare "/path/to/dir1:1"]
testouterr_cmd "sh" "unload $module" $ans ""
@@ -200,7 +200,7 @@ testouterr_cmd "sh" "unload $module" $ans ""
#
set env(PATH) "$old_path"
unset env(FOO_modshare)
unset env(__MODULES_SHARE_FOO)
unset env(FOO)
unsetenv_loaded_module

10
testsuite/modules.50-cmds/047-app-del-undo.exp
View File

@@ -33,7 +33,7 @@ set ts_1 "http://foobar.org"
set ts_2 "http://foobar.net"
set ts_3 "http://foobar.com"
set ts_new "$ts_1 $ts_2"
# test colon char is correctly escaped in _modshare var
# test colon char is correctly escaped in __MODULES_SHARE_ var
set tsmod_new "http\\://foobar.net:1:http\\://foobar.org:1"
set module "append/1.0"
set modulefile "$modpath/$module"
@@ -43,16 +43,16 @@ set modulefile "$modpath/$module"
#
set env(testsuite) "$ts_1 $ts_2 $ts_3"
set env(testsuite_modshare) "http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
setenv_loaded_module $module $modulefile
#
# For the different shells ...
#
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
#
@@ -99,13 +99,13 @@ set module "append/1.6"
set modulefile "$modpath/$module"
set env(testsuite) "$ts_1 $ts_2 $ts_3 http://foobar.io "
set env(testsuite_modshare) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "unload $module" $ans ""

12
testsuite/modules.50-cmds/050-prepend.exp
View File

@@ -173,10 +173,10 @@ set module "prepend/3.0"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1"]
lappend ans [list set FOO ""]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -190,18 +190,18 @@ set module2 "prepend/3.1"
set modulefile2 "$modpath/$module2"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::2"]
lappend ans [list set FOO "/path/to/dir:"]
lappend ans [list set _LMFILES_ "$modulefile:$modulefile2"]
lappend ans [list set LOADEDMODULES "$module:$module2"]
lappend ans [list set FOO_modshare "/path/to/dir:1::2"]
testouterr_cmd_re "sh" "load $module $module2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::2"]
lappend ans [list set FOO "/path/to/dir:"]
lappend ans [list set _LMFILES_ "$modulefile2:$modulefile"]
lappend ans [list set LOADEDMODULES "$module2:$module"]
lappend ans [list set FOO_modshare "/path/to/dir:1::2"]
testouterr_cmd_re "sh" "load $module2 $module" $ans ""
@@ -214,14 +214,14 @@ set module "prepend/2.3"
set modulefile "$modpath/$module"
set old_path "/path/to/dir1"
set env(FOO_modshare) "$old_path:1"
set env(__MODULES_SHARE_FOO) "$old_path:1"
set env(FOO) $old_path
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$old_path"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -234,10 +234,10 @@ set module "prepend/2.4"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$old_path"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$old_path:1:/modules/testsuite2.2:1"]
testouterr_cmd "sh" "load $module" $ans ""

14
testsuite/modules.50-cmds/052-prepend-delim.exp
View File

@@ -33,10 +33,10 @@ set ts_1 "http://foobar.org"
set ts_2 "http://foobar.net"
set ts_3 "http://foobar.com"
set ts_new "$ts_3 $ts_1 $ts_2"
# test colon char is correctly escaped in _modshare var
# test colon char is correctly escaped in __MODULES_SHARE_ var
set tsmod_new "http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.org:1"
set env(testsuite) "$ts_1 $ts_2"
set env(testsuite_modshare) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.org:1:http\\://foobar.net:1"
set module "prepend/1.0"
set modulefile "$modpath/$module"
@@ -44,9 +44,9 @@ set modulefile "$modpath/$module"
# For the different shells ...
#
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
#
@@ -65,9 +65,9 @@ set module "prepend/1.7"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
test_cmd_re "sh" "load $module" $ans
@@ -118,12 +118,12 @@ set ts_new " http://foobar.io $ts_3 $ts_1 $ts_2"
set tsmod_new ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set env(testsuite) "$ts_1 $ts_2"
set env(testsuite_modshare) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.org:1:http\\://foobar.net:1"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""
@@ -136,9 +136,9 @@ set module "prepend/1.9"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""

24
testsuite/modules.50-cmds/055-prepend-undo.exp
View File

@@ -203,15 +203,15 @@ unsetenv_path_var testsuite2
set module "prepend/3.0"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1"
set env(__MODULES_SHARE_FOO) ":1"
set env(FOO) ""
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module" $ans ""
@@ -219,60 +219,60 @@ set module2 "prepend/3.1"
set modulefile2 "$modpath/$module2"
set env(FOO_modshare) "/path/to/dir:1::2"
set env(__MODULES_SHARE_FOO) "/path/to/dir:1::2"
set env(FOO) "/path/to/dir:"
setenv_loaded_module [list $module $module2] [list $modulefile $modulefile2]
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module $module2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1"]
lappend ans [list set FOO ""]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1"]
testouterr_cmd "sh" "unload $module2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::1"]
lappend ans [list set FOO "/path/to/dir:"]
lappend ans [list set _LMFILES_ $modulefile2]
lappend ans [list set LOADEDMODULES $module2]
lappend ans [list set FOO_modshare "/path/to/dir:1::1"]
testouterr_cmd "sh" "unload $module" $ans ""
set env(FOO_modshare) "/path/to/dir:1::2"
set env(__MODULES_SHARE_FOO) "/path/to/dir:1::2"
set env(FOO) "/path/to/dir:"
setenv_loaded_module [list $module2 $module] [list $modulefile2 $modulefile]
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset FOO]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "unload $module $module2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1"]
lappend ans [list set FOO ""]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1"]
testouterr_cmd "sh" "unload $module2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir:1::1"]
lappend ans [list set FOO "/path/to/dir:"]
lappend ans [list set _LMFILES_ $modulefile2]
lappend ans [list set LOADEDMODULES $module2]
lappend ans [list set FOO_modshare "/path/to/dir:1::1"]
testouterr_cmd "sh" "unload $module" $ans ""
@@ -284,15 +284,15 @@ testouterr_cmd "sh" "unload $module" $ans ""
set module "prepend/2.3"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(FOO) ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:/path/to/dir1"
setenv_loaded_module [list $module] [list $modulefile]
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
lappend ans [list set FOO "/path/to/dir1"]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set FOO_modshare "/path/to/dir1:1"]
testouterr_cmd "sh" "unload $module" $ans ""

10
testsuite/modules.50-cmds/057-pre-del-undo.exp
View File

@@ -33,7 +33,7 @@ set ts_1 "http://foobar.org"
set ts_2 "http://foobar.net"
set ts_3 "http://foobar.com"
set ts_new "$ts_1 $ts_2"
# test colon char is correctly escaped in _modshare var
# test colon char is correctly escaped in __MODULES_SHARE_ var
set tsmod_new "http\\://foobar.net:1:http\\://foobar.org:1"
set module "prepend/1.0"
set modulefile "$modpath/$module"
@@ -43,16 +43,16 @@ set modulefile "$modpath/$module"
#
set env(testsuite) "$ts_3 $ts_1 $ts_2"
set env(testsuite_modshare) "http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.com:1:http\\://foobar.org:1:http\\://foobar.net:1"
setenv_loaded_module $module $modulefile
#
# For the different shells ...
#
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
#
@@ -109,13 +109,13 @@ set module "prepend/1.8"
set modulefile "$modpath/$module"
set env(testsuite) " http://foobar.io $ts_3 $ts_1 $ts_2"
set env(testsuite_modshare) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
setenv_loaded_module $module $modulefile
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "unload $module" $ans ""

52
testsuite/modules.50-cmds/060-remove.exp
View File

@@ -109,14 +109,14 @@ unsetenv_path_var testsuite2
set module "remove/2.3"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(__MODULES_SHARE_FOO) ":1:/modules/testsuite2.2/2.2:1:/path/to/dir1:1:/modules/testsuite2.2:1"
set env(FOO) "/path/to/dir1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
lappend ans [list set FOO "/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -128,10 +128,10 @@ set module "remove/2.4"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1"]
lappend ans [list set FOO "/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -143,14 +143,14 @@ testouterr_cmd "sh" "load $module" $ans ""
set module "remove/3.0"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1"
set env(__MODULES_SHARE_FOO) ":1"
set env(FOO) ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1"]
lappend ans [list set FOO ""]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1"]
testouterr_cmd "sh" "load $module" $ans ""
@@ -162,58 +162,58 @@ testouterr_cmd "sh" "load $module" $ans ""
set module "remove/3.0"
set modulefile "$modpath/$module"
unset env(FOO_modshare)
unset env(__MODULES_SHARE_FOO)
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:1:/path/to/dir2:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:1:/path/to/dir2:1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir2:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:3:/path/to/dir2:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:3:/path/to/dir2:1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:2:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set module "remove/3.1"
set modulefile "$modpath/$module"
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir2:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans [msg_load $module "$warn_msgs: --duplicates option has no effect on unload-path"]
@@ -231,62 +231,62 @@ testouterr_cmd "sh" "load $module" "ERR" [msg_load $module $ts_err]
set module "remove/4.1"
set modulefile "$modpath/$module"
set env(FOO_modshare) ":1"
set env(__MODULES_SHARE_FOO) ":1"
set env(FOO) ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1"]
lappend ans [list set FOO ""]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare ":1"]
# out of bound
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir2:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:1"
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir1:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:2"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir2:2"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:2"
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:2:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:2:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set module "remove/4.2"
set modulefile "$modpath/$module"
set env(FOO_modshare) "/path/to/dir1:2:/path/to/dir2:2"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:2:/path/to/dir2:2"
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/dir1:1:/path/to/dir2:1"]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir2:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set FOO_modshare "/path/to/dir1:1:/path/to/dir2:1"]
testouterr_cmd "sh" "load $module" $ans ""
set env(FOO_modshare) "/path/to/dir1:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:1"
set env(FOO) "/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir1"
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list set FOO "/path/to/dir1:/path/to/dir1"]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list unset FOO_modshare]
testouterr_cmd "sh" "load $module" $ans ""
@@ -296,7 +296,7 @@ testouterr_cmd "sh" "load $module" $ans ""
#
set env(PATH) "$old_path"
unset env(FOO_modshare)
unset env(__MODULES_SHARE_FOO)
unset env(FOO)
#

12
testsuite/modules.50-cmds/062-remove-delim.exp
View File

@@ -33,10 +33,10 @@ set ts_1 "http://foobar.org"
set ts_2 "http://foobar.net"
set ts_3 "http://foobar.com"
set ts_new "$ts_1 $ts_2"
# test colon char is correctly escaped in _modshare var
# test colon char is correctly escaped in __MODULES_SHARE_ var
set tsmod_new "http\\://foobar.net:1:http\\://foobar.org:1"
set env(testsuite) "$ts_1 $ts_2 $ts_3"
set env(testsuite_modshare) "http\\://foobar.org:1:http\\://foobar.net:1:http\\://foobar.com:1"
set env(__MODULES_SHARE_testsuite) "http\\://foobar.org:1:http\\://foobar.net:1:http\\://foobar.com:1"
set module "remove/1.0"
set modulefile "$modpath/$module"
@@ -44,9 +44,9 @@ set modulefile "$modpath/$module"
# For the different shells ...
#
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
#
@@ -90,12 +90,12 @@ set module "remove/1.6"
set modulefile "$modpath/$module"
set env(testsuite) "$ts_1 $ts_2 $ts_3 http://foobar.io "
set env(testsuite_modshare) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set env(__MODULES_SHARE_testsuite) ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""
@@ -108,9 +108,9 @@ set module "remove/1.7"
set modulefile "$modpath/$module"
set ans [list]
lappend ans [list set testsuite_modshare $tsmod_new]
lappend ans [list set _LMFILES_ $modulefile]
lappend ans [list set LOADEDMODULES $module]
lappend ans [list set __MODULES_SHARE_testsuite $tsmod_new]
lappend ans [list set testsuite $ts_new]
testouterr_cmd_re "sh" "load $module" $ans ""

2
testsuite/modules.50-cmds/065-remove-undo.exp
View File

@@ -120,7 +120,7 @@ unsetenv_path_var testsuite2
set module "remove/2.3"
set modulefile "$modpath/$module"
set env(FOO_modshare) "/path/to/dir1:1"
set env(__MODULES_SHARE_FOO) "/path/to/dir1:1"
set env(FOO) "/path/to/dir1"
setenv_loaded_module $module $modulefile

2
testsuite/modules.50-cmds/350-allin.exp
View File

@@ -177,7 +177,7 @@ setenv_var __MODULES_LMCONFLICT $module/1&$module/4
setenv_var ts1 "ok"
setenv_var tsu ""
setenv_var TSPATH "dir3 dir2"
setenv_var TSPATH_modshare "dir3:1:dir2:1"
setenv_var __MODULES_SHARE_TSPATH "dir3:1:dir2:1"
setenv_var tsp "dir3 dir2"
set ans [list]
lappend ans [list unset ts1]

6
testsuite/modules.50-cmds/359-allin-env.exp
View File

@@ -140,7 +140,6 @@ testouterr_cmd_re "sh" "load $module/1 $module/2" $ans ""
setenv_loaded_module [list "$module/1" "$module/2"] [list "$modulefile/1" "$modulefile/2"]
set ans [list]
lappend ans [list unset TSPATH2_modshare]
lappend ans [list unset ts1]
lappend ans [list unset ts2]
lappend ans [list unset _LMFILES_]
@@ -156,8 +155,9 @@ lappend ans [list set TSPATH3 ok8]
lappend ans [list unset ts8]
lappend ans [list unset tsall]
lappend ans [list unset ts9]
lappend ans [list set TSPATH3_modshare "ok8:1"]
lappend ans [list unset TSPATH_modshare]
lappend ans [list unset __MODULES_SHARE_TSPATH]
lappend ans [list unset __MODULES_SHARE_TSPATH2]
lappend ans [list set __MODULES_SHARE_TSPATH3 "ok8:1"]
testouterr_cmd "sh" "unload $module/1 $module/2" $ans ""
# test with module loaded but vanished env vars

2
testsuite/modules.50-cmds/373-deps4.exp
View File

@@ -253,11 +253,11 @@ setenv_loaded_module [list g4] [list "$mp/g4"]
# load test that solves a prereq violation
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "/path/to/g4-g1:2"]
lappend ans [list set FOO "/path/to/g4-g1"]
lappend ans [list set __MODULES_LMPREREQ "g4&g1|g2|g3"]
lappend ans [list set _LMFILES_ "$mp/g1:$mp/g4"]
lappend ans [list set LOADEDMODULES "g1:g4"]
lappend ans [list set FOO_modshare "/path/to/g4-g1:2"]
# g4 unload phase did not correctly unset path in FOO (double reference to g1 path)
testouterr_cmd_re "sh" "load g1" $ans [msg_top_load g1 {} {} g4]

92
testsuite/modules.50-cmds/400-source-sh.exp
View File

@@ -35,30 +35,30 @@ setenv_var TESTSUITE_SHTOMOD_PATHDUP 1
# basic load
set ans [list]
lappend ans [list set FOOPATHCB_modshare /path/to/d\{r2:1:/path/to/dir1:1:/path/to/dir3:1]
lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":1:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:1"]
lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set _LMFILES_ $mp/source-sh/1]
lappend ans [list set LOADEDMODULES source-sh/1]
lappend ans [list set FOOPATHDUP "/path/to/dir1:/path/to/dir2:/path/to/dir3:/path/to dir4"]
lappend ans [list set FOOPATHDUPMIX_modshare ":1:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:1"]
lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}]
lappend ans [list set FOOPATHEM :/path/to/dir1:/path/to/dir2:/path/to/dir3]
lappend ans [list set FOOPATHSP {/path/to/dir1 /path/to/dir2 /path/to/dir3}]
lappend ans [list set FOOPATHEM_modshare :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set __MODULES_SHARE_FOOPATHDUPEM :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set __MODULES_SHARE_FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:1:dir4 /path/to/dir3:1"]
lappend ans [list set FOOEM {}]
lappend ans [list set FOOPATHCB /path/to/dir1:/path/to/d\{r2:/path/to/dir3]
lappend ans [list set FOOPATHDUPEM_modshare :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set FOOSP {value }]
lappend ans [list set FOOPATHDUPSPEM {/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to/dir3 }]
lappend ans [list set FOOPATHDUPMIX ":/path/to/dir1:/path/to/dir1 /path/to/dir2 /path/to/dir1:/path/to/dir3"]
lappend ans [list set FOOCB va\{ue]
lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
lappend ans [list set FOOPATH_modshare /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set __MODULES_SHARE_FOOPATHDUP "/path/to/dir1:1:/path/to dir4:1:/path/to/dir2:1:/path/to/dir3:1"]
lappend ans [list set __MODULES_SHARE_FOOPATHEM :1:/path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set FOO value]
lappend ans [list set FOOPATHDUP_modshare "/path/to/dir1:1:/path/to dir4:1:/path/to/dir2:1:/path/to/dir3:1"]
lappend ans [list set FOOPATHDUPEM :/path/to/dir1:/path/to/dir2:/path/to/dir3]
lappend ans [list set FOOPATHDUPSP "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:dir4 /path/to/dir3"]
lappend ans [list set FOOPATHSPEM {/path/to/dir1 /path/to/dir2 /path/to/dir3 }]
lappend ans [list set FOOPATHDUPSP_modshare "/path/to/dir1 /path/to/dir1 /path/to/dir2 /path/to/dir1 /path/to/dir3 /path/to:1:dir4 /path/to/dir3:1"]
lappend ans [list set __MODULES_SHARE_FOOPATHCB /path/to/d\{r2:1:/path/to/dir1:1:/path/to/dir3:1]
lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}]
lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tcl | tr -d \\ 2>/dev/null | awk '{print $3}')}]
lappend ans [list alias alcb echo\ f\{o]
@@ -93,30 +93,30 @@ setenv_var FOO value
setenv_var FOOPATHSPEM {/path/to/dir1 /path/to/dir2 /path/to/dir3 }
set ans [list]
lappend ans [list unset FOOPATHCB_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOOPATHDUP]
lappend ans [list unset FOOPATHDUPMIX_modshare]
lappend ans [list unset __MODULES_LMSOURCESH]
lappend ans [list unset FOOPATHEM]
lappend ans [list unset FOOPATHSP]
lappend ans [list unset FOOPATHEM_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
lappend ans [list unset FOOEM]
lappend ans [list unset FOOPATHCB]
lappend ans [list unset FOOPATHDUPEM_modshare]
lappend ans [list unset FOOSP]
lappend ans [list unset FOOPATHDUPSPEM]
lappend ans [list unset FOOPATHDUPMIX]
lappend ans [list unset FOOCB]
lappend ans [list unset FOOPATH]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
lappend ans [list unset FOO]
lappend ans [list unset FOOPATHDUP_modshare]
lappend ans [list unset FOOPATHDUPEM]
lappend ans [list unset FOOPATHDUPSP]
lappend ans [list unset FOOPATHSPEM]
lappend ans [list unset FOOPATHDUPSP_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
lappend ans [list unalias alsp]
lappend ans [list unalias alfoo]
lappend ans [list unalias alcb]
@@ -147,39 +147,39 @@ setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.s
set ans [list]
lappend ans [list unset FOOMINI]
lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
lappend ans [list set _LMFILES_ $mp/source-sh/1]
lappend ans [list set LOADEDMODULES source-sh/1]
lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}]
lappend ans [list set FOOPATH_modshare /path/to/dir1:1:/path/to/dir2:1:/path/to/dir3:1]
lappend ans [list unalias almini]
testouterr_cmd sh {unload source-sh/2} $ans {}
set ans [list]
lappend ans [list unset FOOPATHCB_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
lappend ans [list set __MODULES_SHARE_FOOPATH /path/to/mini:1]
lappend ans [list set _LMFILES_ $mp/source-sh/2]
lappend ans [list set LOADEDMODULES source-sh/2]
lappend ans [list unset FOOPATHDUP]
lappend ans [list unset FOOPATHDUPMIX_modshare]
lappend ans [list set __MODULES_LMSOURCESH source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value]
lappend ans [list unset FOOPATHEM]
lappend ans [list unset FOOPATHSP]
lappend ans [list unset FOOPATHEM_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
lappend ans [list unset FOOEM]
lappend ans [list unset FOOPATHCB]
lappend ans [list unset FOOPATHDUPEM_modshare]
lappend ans [list unset FOOSP]
lappend ans [list unset FOOPATHDUPSPEM]
lappend ans [list unset FOOPATHDUPMIX]
lappend ans [list unset FOOCB]
lappend ans [list set FOOPATH /path/to/mini]
lappend ans [list set FOOPATH_modshare /path/to/mini:1]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
lappend ans [list unset FOO]
lappend ans [list unset FOOPATHDUP_modshare]
lappend ans [list unset FOOPATHDUPEM]
lappend ans [list unset FOOPATHDUPSP]
lappend ans [list unset FOOPATHSPEM]
lappend ans [list unset FOOPATHDUPSP_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
lappend ans [list unalias alsp]
lappend ans [list unalias alfoo]
lappend ans [list unalias alcb]
@@ -193,16 +193,16 @@ testouterr_cmd sh {unload source-sh/1} $ans {}
# load a third modulefile, using same script than firstly loaded module
set ans [list]
lappend ans [list set FOOPATHDUPEM :/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3::/path/to/dir3]
lappend ans [list unset FOOPATHDUP_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
lappend ans [list set __MODULES_SHARE_FOOPATHDUPMIX ":2:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:2"]
lappend ans [list set FOOPATHDUPMIX :/path/to/dir1:/path/to/dir1\ /path/to/dir2\ /path/to/dir1:/path/to/dir3]
lappend ans [list set FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list set _LMFILES_ $mp/source-sh/1:$mp/source-sh/2:$mp/source-sh/3]
lappend ans [list set LOADEDMODULES source-sh/1:source-sh/2:source-sh/3]
lappend ans [list unset FOOPATHDUPEM_modshare]
lappend ans [list set FOOPATHDUP "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3:/path/to dir4:/path/to/dir3"]
lappend ans [list set FOOPATHDUPMIX_modshare ":2:/path/to/dir1 /path/to/dir2 /path/to/dir1:1:/path/to/dir1:1:/path/to/dir3:2"]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
lappend ans [list set __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}\|setenv\ FOOSP\ \{value\ \}:source-sh/2\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value:source-sh/3\&bash\ testsuite/example/sh-to-mod.sh\|append-path\ FOOPATHDUPMIX\ /path/to/dir3\ \{\}\|chdir\ $mp\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alfoo\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcfoo\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOOPATH\ /path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir3\|setenv\ FOOPATHDUP\ \{/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>/path/to\ dir4\<EnvModEscPS\>/path/to/dir3\}\|setenv\ FOOPATHDUPEM\ \<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir2\<EnvModEscPS\>/path/to/dir1\<EnvModEscPS\>/path/to/dir3\<EnvModEscPS\>\<EnvModEscPS\>/path/to/dir3]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list alias alsp {echo f\"o; echo b\\\"r; echo f\'o}]
lappend ans [list alias alfoo {echo $(grep "report .Modules " ../../modulecmd.tcl | tr -d \\ 2>/dev/null | awk '{print $3}')}]
lappend ans [list alias alcb echo\ f\{o]
@@ -221,9 +221,9 @@ testouterr_cmd_re sh {load source-sh/3} $ans {}
# unload from that point
setenv_loaded_module [list source-sh/1 source-sh/2 source-sh/3] [list $mp/source-sh/1 $mp/source-sh/2 $mp/source-sh/3]
setenv_var FOOPATHDUP "/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3:/path/to dir4:/path/to/dir3"
unsetenv_var FOOPATHDUPEM_modshare
unsetenv_var FOOPATH_modshare
unsetenv_var FOOPATHDUP_modshare
unsetenv_var __MODULES_SHARE_FOOPATHDUPEM
unsetenv_var __MODULES_SHARE_FOOPATH
unsetenv_var __MODULES_SHARE_FOOPATHDUP
setenv_path_var FOOPATHDUPMIX :/path/to/dir1:/path/to/dir1\ /path/to/dir2\ /path/to/dir1:/path/to/dir3
setenv_var FOOPATH /path/to/dir1:/path/to/dir2:/path/to/dir3
setenv_var FOOPATHDUPEM :/path/to/dir1:/path/to/dir1:/path/to/dir2:/path/to/dir1:/path/to/dir3::/path/to/dir3
@@ -238,11 +238,11 @@ lappend ans [list unset FOOCB]
lappend ans [list unset FOOPATH]
lappend ans [list unset FOOPATHDUPEM]
lappend ans [list unset FOO]
lappend ans [list unset FOOPATHSPEM]
lappend ans [list unsetpath FOOPATHDUPMIX]
lappend ans [list unsetpath FOOPATHEM]
lappend ans [list unsetpath FOOPATHCB]
lappend ans [list unsetpath FOOPATHDUPSP]
lappend ans [list unset FOOPATHSPEM]
lappend ans [list unset FOOEM]
lappend ans [list set LOADEDMODULES source-sh/2:source-sh/3]
lappend ans [list set _LMFILES_ $mp/source-sh/2:$mp/source-sh/3]
@@ -681,6 +681,7 @@ unsetenv_var TESTSUITE_SHTOMOD_NOVAR
set ans [list]
lappend ans [list set FOO value]
lappend ans [list set FOOMINI value]
lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/to/mini:1]
lappend ans [list set FOOPATH /path/to/mini:]
lappend ans [list set FOOCB va\{ue]
lappend ans [list set _LMFILES_ $mp/source-sh/5.0]
@@ -688,12 +689,12 @@ lappend ans [list set LOADEDMODULES source-sh/5.0]
lappend ans [list set FOOEM {}]
lappend ans [list set __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOSP\ \{value\ \}\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\ \{\}\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1]
lappend ans [list set FOOARG1 arg1]
lappend ans [list set FOOPATH_modshare :1:/path/to/mini:1]
lappend ans [list set FOOSP {value }]
lappend ans [list alias almini echo\ mini]
testouterr_cmd sh {load source-sh/5.0} $ans {}
set ans [list]
lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/to/mini:1]
lappend ans [list set FOOMINI value]
lappend ans [list set LOADEDMODULES source-sh/5.1]
lappend ans [list set _LMFILES_ $mp/source-sh/5.1]
@@ -704,7 +705,6 @@ lappend ans [list set FOOSP {value }]
lappend ans [list set FOOARG2 arg2]
lappend ans [list set FOOCB va\{ue]
lappend ans [list set FOOPATH /path/to/mini:]
lappend ans [list set FOOPATH_modshare :1:/path/to/mini:1]
lappend ans [list set FOO value]
lappend ans [list alias almini echo\ mini]
testouterr_cmd sh {load source-sh/5.1} $ans {}
@@ -810,29 +810,29 @@ testouterr_cmd sh {unload source-sh/1} $ans {}
# partial __MODULES_LMSOURCESH
setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|chdir\ $mp\|prepend-path\ FOOPATH\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHCB\ /path/to/dir1\ /path/to/d\\\{r2\ /path/to/dir3\|prepend-path\ FOOPATHDUP\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \{/path/to\ dir4\}\|prepend-path\ FOOPATHDUPEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|prepend-path\ FOOPATHDUPMIX\ \{\}\ /path/to/dir1\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir1\}\ /path/to/dir3\|prepend-path\ FOOPATHDUPSP\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to\}\ \{dir4\ /path/to/dir3\}\|prepend-path\ FOOPATHEM\ \{\}\ /path/to/dir1\ /path/to/dir2\ /path/to/dir3\|set-alias\ alcb\ \{\}\|set-alias\ alem\ \{\}\|set-alias\ alsp\ \{\}\|set-function\ funccb\ \{\}\|set-function\ funcnl\ \{\}\|set-function\ funcsp\ \{\}\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOPATHDUPSPEM\ \{/path/to/dir1\ /path/to/dir1\ /path/to/dir2\ /path/to/dir1\ /path/to/dir3\ /path/to/dir3\ \}\|setenv\ FOOPATHSP\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\}\|setenv\ FOOPATHSPEM\ \{/path/to/dir1\ /path/to/dir2\ /path/to/dir3\ \}
set ans [list]
lappend ans [list unset FOOPATHCB_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPMIX]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset FOOPATHDUP]
lappend ans [list unset FOOPATHDUPMIX_modshare]
lappend ans [list unset __MODULES_LMSOURCESH]
lappend ans [list unset FOOPATHEM]
lappend ans [list unset FOOPATHSP]
lappend ans [list unset FOOPATHEM_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPEM]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUPSP]
lappend ans [list unset FOOEM]
lappend ans [list unset FOOPATHCB]
lappend ans [list unset FOOPATHDUPEM_modshare]
lappend ans [list unset FOOPATHDUPSPEM]
lappend ans [list unset FOOPATHDUPMIX]
lappend ans [list unset FOOCB]
lappend ans [list unset FOOPATH]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHDUP]
lappend ans [list unset __MODULES_SHARE_FOOPATHEM]
lappend ans [list unset FOO]
lappend ans [list unset FOOPATHDUP_modshare]
lappend ans [list unset FOOPATHDUPEM]
lappend ans [list unset FOOPATHDUPSP]
lappend ans [list unset FOOPATHSPEM]
lappend ans [list unset FOOPATHDUPSP_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATHCB]
lappend ans [list unalias alsp]
lappend ans [list unalias alcb]
lappend ans [list unalias alem]
@@ -862,24 +862,24 @@ setenv_var __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod
set ans [list]
# re-serialized entry of __MODULES_LMSOURCESH is not equal to the one recorded in environment, so variable is not unset
lappend ans [list unset FOOMINI]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset FOOPATH]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\ \{\}\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1]
lappend ans [list unset FOOARG1]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unalias almini]
testouterr_cmd sh {unload source-sh/5.0} $ans {}
setenv_var __MODULES_LMSOURCESH source-sh/5.0\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\ \{\}\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1
set ans [list]
lappend ans [list unset FOOMINI]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset FOOPATH]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_LMSOURCESH]
lappend ans [list unset FOOARG1]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unalias almini]
testouterr_cmd sh {unload source-sh/5.0} $ans {}
@@ -888,12 +888,12 @@ setenv_var __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod
set ans [list]
# value set-alias and set-function is rewritten when parsed
lappend ans [list unset FOOMINI]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset FOOPATH]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list set __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOPATH\ /path/to/mini\ \{\}\|set-alias\ almini\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1]
lappend ans [list unset FOOARG1]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unalias almini]
testouterr_cmd sh {unload source-sh/5.0} $ans {}
@@ -983,17 +983,17 @@ unsetenv_var FOOCB
setenv_var TESTSUITE_SOURCESH_ESCCHAR 1
set ans [list]
lappend ans [list set FOOESC_modshare :1]
lappend ans [list set __MODULES_SHARE_FOOPATH :1:/path/\{\|:1:/path/to/mini:1:/path/\}\&:1]
lappend ans [list set FOOMINI value]
lappend ans [list set LOADEDMODULES source-sh/5.0]
lappend ans [list set _LMFILES_ $mp/source-sh/5.0]
lappend ans [list set __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOSP\ \{value\ \}\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOESC\ \{\}\|prepend-path\ FOOPATH\ /path/\\\{\<EnvModEscS2\>\ /path/to/mini\ \{\}\ /path/\\\}\<EnvModEscS1\>\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1]
lappend ans [list set FOOEM {}]
lappend ans [list set FOOSP {value }]
lappend ans [list set __MODULES_SHARE_FOOESC :1]
lappend ans [list set FOOARG1 arg1]
lappend ans [list set FOOCB va\{ue]
lappend ans [list set FOOPATH /path/\{\|:/path/to/mini::/path/\}\&]
lappend ans [list set FOOPATH_modshare :1:/path/\{\|:1:/path/to/mini:1:/path/\}\&:1]
lappend ans [list set FOO value]
lappend ans [list set FOOESC {}]
lappend ans [list alias almini echo\ mini]
@@ -1010,17 +1010,17 @@ setenv_var FOO value
setenv_var __MODULES_LMSOURCESH source-sh/5.0\&bash\ testsuite/example/sh-to-mod.sh\|setenv\ FOO\ value\|setenv\ FOOCB\ va\\\{ue\|setenv\ FOOEM\ \{\}\|setenv\ FOOSP\ \{value\ \}\&sh\ testsuite/example/mini-sh-to-mod.sh\|prepend-path\ FOOESC\ \{\}\|prepend-path\ FOOPATH\ /path/\\\{\<EnvModEscS2\>\ /path/to/mini\ \{\}\ /path/\\\}\<EnvModEscS1\>\|set-alias\ almini\ \{\}\|setenv\ FOOMINI\ value\&bash\ testsuite/example/sh-to-mod.sh\ arg1\|setenv\ FOOARG1\ arg1
setenv_path_var FOOESC {}
set ans [list]
lappend ans [list unset FOOESC_modshare]
lappend ans [list unset __MODULES_SHARE_FOOPATH]
lappend ans [list unset FOOMINI]
lappend ans [list unset _LMFILES_]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_LMSOURCESH]
lappend ans [list unset FOOEM]
lappend ans [list unset FOOSP]
lappend ans [list unset __MODULES_SHARE_FOOESC]
lappend ans [list unset FOOARG1]
lappend ans [list unset FOOCB]
lappend ans [list unset FOOPATH]
lappend ans [list unset FOOPATH_modshare]
lappend ans [list unset FOO]
lappend ans [list unset FOOESC]
lappend ans [list unalias almini]

8
testsuite/modules.50-cmds/471-variant-unload.exp
View File

@@ -247,11 +247,13 @@ testouterr_cmd_re sh {switch variant/4.0 bar=1 foo=val2} $ans {}
# unknown variant on switched-on module
set ans [list]
lappend ans [list unset TS1]
lappend ans [list unset __MODULES_SHARE_TS1]
lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset _LMFILES_]
lappend ans [list unset TS2]
lappend ans [list unset __MODULES_SHARE_TS2]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unsetpath TS1]
lappend ans [list unsetpath TS2]
lappend ans [list unset _LMFILES_]
lappend ans [list unset TS0]
lappend ans [list ERR]
set tserr [msg_load variant/4.0{bar=2:baz=val1:foo=val1} [err_unkvar baz]]\n\n[msg_switch variant/4.0{bar=2:foo=val1} variant/4.0{bar=2:baz=val1:foo=val1} [err_swon variant/4.0{bar=2:baz=val1:foo=val1}]]

12
testsuite/modules.61-coll/040-restore.exp
View File

@@ -634,11 +634,12 @@ $err_path'{b\\*r= val1}'"
setenv_var TESTSUITE_VARIANT coll26
set ans [list]
lappend ans [list setpath MODULEPATH $c26modpath]
lappend ans [list set LOADEDMODULES $c26mod2:$c26mod3]
lappend ans [list set _LMFILES_ $c26modpath1/$c26mod2:$c26modpath1/$c26mod3]
lappend ans [list set __MODULES_LMVARIANT "$c26mod3&b*r| val1|0|2"]
lappend ans [list set _LMFILES_ $c26modpath1/$c26mod2:$c26modpath1/$c26mod3]
lappend ans [list set LOADEDMODULES $c26mod2:$c26mod3]
lappend ans [list set __MODULES_LMTAG $c26mod2&auto-loaded]
lappend ans [list set MODULEPATH $c26modpath]
lappend ans [list set __MODULES_SHARE_MODULEPATH $c26modpath:1]
lappend ans [list ERR]
testouterr_cmd_re sh "restore $coll26fp" $ans "[escre [msg_load {variant/1.0} [err_novarval {fo o} {val1 val2 {v?l1 }}]]]
@@ -696,9 +697,10 @@ testouterr_cmd_re sh "restore $coll27fp" ERR "$error_msgs: $msg_nomodnameinarg '
testouterr_cmd_re sh "restore $coll28fp" ERR "$error_msgs: $msg_nomodnameinarg '@1.0'"
setenv_var TESTSUITE_VARIANT coll29
set ans [list]
lappend ans [list set LOADEDMODULES $c26mod2]
lappend ans [list set _LMFILES_ $c26modpath1/$c26mod2]
lappend ans [list setpath MODULEPATH $c26modpath1]
lappend ans [list set LOADEDMODULES $c26mod2]
lappend ans [list set MODULEPATH $c26modpath1]
lappend ans [list set __MODULES_SHARE_MODULEPATH $c26modpath1:1]
lappend ans [list ERR]
testouterr_cmd_re sh "restore $coll29fp" $ans [msg_load variant/1.0{unk=val} [err_unkvar unk]]\n\n[msg_load foo/1.0]

43
testsuite/modules.70-maint/120-autoinit.exp
View File

@@ -555,15 +555,11 @@ foreach set_shell_startup [list {} 0 1] {
lappend ans [list set MODULES_CMD $modulecmd_path]
if {[is_real_shell $shell] && ($env(MODULES_SET_SHELL_STARTUP) eq {1} || ($env(MODULES_SET_SHELL_STARTUP) ne {0} && $install_setshellstartup eq {y}))} {
lappend ans [list set ENV $install_initdir/profile.sh]
if {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set BASH_ENV $install_initdir/bash]
} elseif {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set MODULESHOME $moduleshome]
if {$shell eq {ksh}} {
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
}
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -571,15 +567,12 @@ foreach set_shell_startup [list {} 0 1] {
lappend ans [list set MODULES_CMD $modulecmd_path]
if {[is_real_shell $shell] && ($env(MODULES_SET_SHELL_STARTUP) eq {1} || ($env(MODULES_SET_SHELL_STARTUP) ne {0} && $install_setshellstartup eq {y}))} {
lappend ans [list set ENV $install_initdir/profile.sh]
if {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set BASH_ENV $install_initdir/bash]
} elseif {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set MODULESHOME $moduleshome]
if {$shell eq {ksh}} {
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
}
}
@@ -650,18 +643,12 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set MODULES_CMD $modulecmd_path]
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set ENV $install_initdir/profile.sh]
if {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set BASH_ENV $install_initdir/bash]
} else {
if {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
}
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES ""]
if {$shell eq {ksh}} {
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
}
lappend ans [list set MODULEPATH ""]
@@ -676,16 +663,14 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set ENV $install_initdir/profile.sh]
}
if {$shell eq {ksh}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set MODULEPATH_modshare "(.*)"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "(.*)"]
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES ""]
if {$shell eq {ksh}} {
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
}
lappend ans [list set MODULEPATH "$install_modulepath:$install_prefix/test/modulefiles:$install_prefix/test/etc"]
@@ -700,7 +685,7 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set ENV $install_initdir/profile.sh]
}
lappend ans [list set MODULEPATH_modshare "$install_modulepath:1"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$install_modulepath:1"]
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
@@ -719,18 +704,16 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set MODULESHOME $install_initdir]
lappend ans [list set _LMFILES_ "$install_modulefilesdir/null"]
if {$shell eq {ksh} || $shell eq {sh} || $shell eq {bash}} {
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
}
lappend ans [list set MODULES_CMD $modulecmd_path]
if {$shell eq {ksh} || $shell eq {sh} || $shell eq {bash}} {
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
}
lappend ans [list set MODULES_AUTO_HANDLING 0]
lappend ans [list set MODULES_ML 0]
lappend ans [list set MODULEPATH "$install_modulepath"]
lappend ans [list set MODULES_SET_SHELL_STARTUP 0]
lappend ans [list set MODULES_SHELLS_WITH_KSH_FPATH "sh:bash"]
lappend ans [list set MODULEPATH_modshare "$install_modulepath:1"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "$install_modulepath:1"]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
}
@@ -744,12 +727,12 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list ERR]
lappend ans [list [set "func_$shell"]]
lappend ans [list set MODULES_CMD $modulecmd_path]
lappend ans [list set FPATH_modshare $install_initdir/ksh-functions:1]
lappend ans [list set MODULEPATH_modshare (.*)]
lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set __MODULES_LMPREREQ m3&m1]
lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
lappend ans [list set LOADEDMODULES "m1:m3:space yc/4"]
lappend ans [list set __MODULES_SHARE_FPATH $install_initdir/ksh-functions:1]
lappend ans [list set FPATH $install_initdir/ksh-functions]
lappend ans [list set __MODULES_LMTAG m1&auto-loaded]
lappend ans [list set MODULEPATH "$modpath wspace:$modpath.deps"]
@@ -761,7 +744,7 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set MODULE_VERSION_STACK "(.*)"]
}
lappend ans [list set MODULES_CMD $modulecmd_path]
lappend ans [list set MODULEPATH_modshare (.*)]
lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set __MODULES_LMPREREQ m3&m1]
lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
@@ -801,7 +784,7 @@ if {!$insmodspath && $initrc_exinstalled && !$install_setshellstartup && $modrc
lappend ans [list set MODULE_VERSION_STACK "(.*)"]
}
lappend ans [list set MODULES_CMD $modulecmd_path]
lappend ans [list set MODULEPATH_modshare (.*)]
lappend ans [list set __MODULES_SHARE_MODULEPATH (.*)]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set __MODULES_LMPREREQ m3&m1]
lappend ans [list set _LMFILES_ "$modpath.deps/m1:$modpath.deps/m3:$modpath wspace/space yc/4"]
@@ -873,7 +856,7 @@ if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modul
if {$install_setshellstartup eq {y}} {
lappend ans [list set ENV $install_initdir/profile.sh]
}
lappend ans [list set MODULEPATH_modshare "(.*)"]
lappend ans [list set __MODULES_SHARE_MODULEPATH "(.*)"]
if {$install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}

43
testsuite/modules.70-maint/140-multiargs.exp
View File

@@ -106,6 +106,7 @@ proc multi_test_case {args} {
if {[info exists "::errlo_${m}"]} {
set errlo [set "::errlo_${m}"]
set erri $i
set errmod [set "::mod_${m}"]
if {[info exists "::errsrc_${m}"]} {
set errsrc [set "::errsrc_${m}"]
} else {
@@ -117,11 +118,17 @@ proc multi_test_case {args} {
}
if {[info exists "::setenv_${m}"]} {
lappend ans_lo [set "::setenv_${m}"]
lappend ans_src [set "::setenv_${m}"]
if {[lindex [set "::setenv_${m}"] 0] eq {setpath}} {
lappend ans_lo [list set __MODULES_SHARE_[lindex [set "::setenv_${m}"] 1] "(.*)"]
lappend ans_lo [list set {*}[lrange [set "::setenv_${m}"] 1 end]]
lappend ans_src [list set __MODULES_SHARE_[lindex [set "::setenv_${m}"] 1] "(.*)"]
lappend ans_src [list set {*}[lrange [set "::setenv_${m}"] 1 end]]
} else {
lappend ans_nonpath_lo [set "::setenv_${m}"]
}
}
if {[info exists "::srcenv_${m}"]} {
lappend ans_src [set "::srcenv_${m}"]
lappend ans_nonpath_src [set "::srcenv_${m}"]
}
if {[info exists "::unsetenv_${m}"]} {
lappend ans_unlo [set "::unsetenv_${m}"]
@@ -162,28 +169,38 @@ proc multi_test_case {args} {
unsetenv_loaded_module
if {[info exists errlo]} {
if {$erri == 3} {
if {$erri == 1} {
lappend ans_lo [list set _LMFILES_ [join $modulefile ":"]]
lappend ans_lo [list set LOADEDMODULES [join $module ":"]]
} else {
set ans_lo [lreverse $ans_lo]
if {[string first "module/" $mod] == 0} {
if {[string first "module/" $errmod] == 0} {
set ans_src [lreverse $ans_src]
}
}
if {$erri == 1} {
lappend ans_lo [list set LOADEDMODULES [join $module ":"]]
lappend ans_lo [list set _LMFILES_ [join $modulefile ":"]]
} else {
lappend ans_lo [list set _LMFILES_ [join $modulefile ":"]]
lappend ans_lo [list set LOADEDMODULES [join $module ":"]]
}
lappend ans_lo [list ERR]
lappend ans_src [list ERR]
} else {
set errlo ""
set errsrc ""
lappend ans_lo [list set LOADEDMODULES [join $module ":"]]
lappend ans_lo [list set _LMFILES_ [join $modulefile ":"]]
lappend ans_lo [list set LOADEDMODULES [join $module ":"]]
}
if {[info exists ans_nonpath_src]} {
lappend ans_src {*}$ans_nonpath_src
}
if {[info exists ans_nonpath_lo]} {
lappend ans_lo {*}$ans_nonpath_lo
lappend ans_src {*}$ans_nonpath_lo
}
if {$errlo ne {}} {
lappend ans_lo [list ERR]
lappend ans_src [list ERR]
}
testouterr_cmd_re "sh" "load $modsym" $ans_lo "$errlo"
testouterr_cmd_re "sh" "display $modsym" $retdi "$disp"
testouterr_cmd_re "sh" "help $modsym" $retdi "$help"

30
testsuite/modules.70-maint/150-append-path.exp
View File

@@ -31,8 +31,8 @@ if {[info exists env(FOO)]} {
set path1 "/path/to/dir1"
set path2 "/path/other/dir2"
lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
lappend ans [list set FOO $path1]
lappend ans [list set FOO_modshare "$path1:1"]
testouterr_cmd_re "sh" "append-path FOO $path1" $ans ""
@@ -44,8 +44,8 @@ if { $verbose > 0 } {
set env(FOO) $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:2"]
lappend ans [list set FOO "$path1"]
lappend ans [list set FOO_modshare "$path1:2"]
testouterr_cmd_re "sh" "append-path FOO $path1" $ans ""
set ans [list]
@@ -89,29 +89,29 @@ testouterr_cmd_re "sh" "append-path --delim= FOO /path/to" "ERR" "$error_msgs: a
set path1 "/path/to/dir1"
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = '$path1:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
send_user "\tSetup FOO = '$path1'\n"
}
set env(FOO_modshare) "$path1:1"
set env(__MODULES_SHARE_FOO) "$path1:1"
set env(FOO) $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO "$path1:/modules/testsuite2.2:/modules/testsuite2.2/2.2:"]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
testouterr_cmd_re "sh" "append-path FOO /modules/testsuite2.2:/modules/testsuite2.2/2.2:" $ans ""
testouterr_cmd_re "sh" "append-path FOO /modules/testsuite2.2 /modules/testsuite2.2/2.2:" $ans ""
# with specific delim
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = 'http://foobar.org:1:http://foobar.net:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = 'http://foobar.org:1:http://foobar.net:1'\n"
send_user "\tSetup FOO = 'http://foobar.org,http://foobar.net'\n"
}
set env(FOO_modshare) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_FOO) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(FOO) "http://foobar.org,http://foobar.net"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
lappend ans [list set FOO "http://foobar.org,http://foobar.net,http://foobar.com,http://foobar.io,"]
lappend ans [list set FOO_modshare ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com,http://foobar.io," $ans ""
testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com http://foobar.io," $ans ""
@@ -121,15 +121,15 @@ testouterr_cmd_re "sh" "append-path -d , FOO http://foobar.com http://foobar.io,
#
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = '$path1:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
send_user "\tSetup FOO = '$path1'\n"
}
set env(FOO_modshare) "$path1:1"
set env(__MODULES_SHARE_FOO) "$path1:1"
set env(FOO) $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:2"]
lappend ans [list set FOO "$path1:$path1"]
lappend ans [list set FOO_modshare "$path1:2"]
testouterr_cmd_re "sh" "append-path --duplicates FOO $path1" $ans ""
testouterr_cmd_re "sh" "append-path --index --duplicates FOO $path1" $ans "$warn_msgs: --index option has no effect on add-path"
@@ -139,15 +139,15 @@ testouterr_cmd_re "sh" "append-path --index --duplicates FOO $path1" $ans "$warn
#
set ans [list]
lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:1"]
lappend ans [list set DYLD_FOO "$path1"]
lappend ans [list set MODULES_MODSHARE_DYLD_FOO "$path1:1"]
testouterr_cmd_re "sh" "append-path DYLD_FOO $path1" $ans ""
if { $verbose > 0 } {
send_user "\tSetup MODULES_MODSHARE_DYLD_FOO = '$path1:1'\n"
send_user "\tSetup __MODULES_SHARE_DYLD_FOO = '$path1:1'\n"
send_user "\tSetup DYLD_FOO = '$path1'\n"
}
set env(MODULES_MODSHARE_DYLD_FOO) "$path1:1"
set env(__MODULES_SHARE_DYLD_FOO) "$path1:1"
set env(DYLD_FOO) $path1
# path-variable handling not effective on OSX with DYLD variables when System
@@ -161,8 +161,8 @@ if {$sip_enabled} {
set tserr "(dyld: warning, unknown environment variable: DYLD_FOO\n|)"
set ans [list]
lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:$dyld_refcount"]
lappend ans [list set DYLD_FOO "$path1"]
lappend ans [list set MODULES_MODSHARE_DYLD_FOO "$path1:$dyld_refcount"]
testouterr_cmd_re "sh" "append-path DYLD_FOO $path1" $ans $tserr

22
testsuite/modules.70-maint/151-prepend-path.exp
View File

@@ -31,8 +31,8 @@ if {[info exists env(FOO)]} {
set path1 "/path/to/dir1"
set path2 "/path/other/dir2"
lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
lappend ans [list set FOO $path1]
lappend ans [list set FOO_modshare "$path1:1"]
testouterr_cmd_re "sh" "prepend-path FOO $path1" $ans ""
@@ -44,8 +44,8 @@ if { $verbose > 0 } {
set env(FOO) $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:2"]
lappend ans [list set FOO "$path1"]
lappend ans [list set FOO_modshare "$path1:2"]
testouterr_cmd_re "sh" "prepend-path FOO $path1" $ans ""
set ans [list]
@@ -89,29 +89,29 @@ testouterr_cmd_re "sh" "prepend-path -d : " "ERR" "$error_msgs: add-path $msg_va
set path1 "/path/to/dir1"
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = '$path1:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1'\n"
send_user "\tSetup FOO = '$path1'\n"
}
set env(FOO_modshare) "$path1:1"
set env(__MODULES_SHARE_FOO) "$path1:1"
set env(FOO) $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
lappend ans [list set FOO ":/modules/testsuite2.2:/modules/testsuite2.2/2.2:$path1"]
lappend ans [list set FOO_modshare ":1:/modules/testsuite2.2/2.2:1:$path1:1:/modules/testsuite2.2:1"]
testouterr_cmd_re "sh" "prepend-path FOO :/modules/testsuite2.2:/modules/testsuite2.2/2.2" $ans ""
testouterr_cmd_re "sh" "prepend-path FOO :/modules/testsuite2.2 /modules/testsuite2.2/2.2" $ans ""
# with specific delim
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = 'http://foobar.org:1:http://foobar.net:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = 'http://foobar.org:1:http://foobar.net:1'\n"
send_user "\tSetup FOO = 'http://foobar.org,http://foobar.net'\n"
}
set env(FOO_modshare) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(__MODULES_SHARE_FOO) "http\\://foobar.org:1:http\\://foobar.net:1"
set env(FOO) "http://foobar.org,http://foobar.net"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
lappend ans [list set FOO ",http://foobar.com,http://foobar.io,http://foobar.org,http://foobar.net"]
lappend ans [list set FOO_modshare ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"]
testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com,http://foobar.io" $ans ""
testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com http://foobar.io" $ans ""
@@ -121,15 +121,15 @@ testouterr_cmd_re "sh" "prepend-path -d , FOO ,http://foobar.com http://foobar.i
#
if { $verbose > 0 } {
send_user "\tSetup FOO_modshare = '$path1:1:/foo:1'\n"
send_user "\tSetup __MODULES_SHARE_FOO = '$path1:1:/foo:1'\n"
send_user "\tSetup FOO = '$path1:/foo'\n"
}
set env(FOO_modshare) "$path1:1:/foo:1"
set env(__MODULES_SHARE_FOO) "$path1:1:/foo:1"
set env(FOO) "$path1:/foo"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:2:/foo:1"]
lappend ans [list set FOO "$path1:$path1:/foo"]
lappend ans [list set FOO_modshare "$path1:2:/foo:1"]
testouterr_cmd_re "sh" "prepend-path --duplicates FOO $path1" $ans ""

24
testsuite/modules.70-maint/152-remove-path.exp
View File

@@ -52,12 +52,12 @@ testouterr_cmd_re "sh" "remove-path --delim : FOO $path2" $ans ""
testouterr_cmd_re "sh" "remove-path --delim=: FOO $path2" $ans ""
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:1:$path2:1"]
lappend ans [list set FOO "$path1:$path2"]
lappend ans [list set FOO_modshare "$path1:1:$path2:1"]
testouterr_cmd_re "sh" "remove-path FOO $path3" $ans ""
unsetenv_var FOO_modshare
unsetenv_var __MODULES_SHARE_FOO
setenv_var FOO "$path1,$path2"
set ans [list]
@@ -90,18 +90,18 @@ set path1 "/path/to/dir1"
setenv_path_var FOO $path1 "/modules/testsuite2.2" "/modules/testsuite2.2/2.2" {}
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:1"]
lappend ans [list set FOO "$path1"]
lappend ans [list set FOO_modshare "$path1:1"]
testouterr_cmd_re "sh" "remove-path FOO /modules/testsuite2.2:/modules/testsuite2.2/2.2:" $ans ""
testouterr_cmd_re "sh" "remove-path FOO /modules/testsuite2.2 /modules/testsuite2.2/2.2:" $ans ""
# with specific delim
setenv_var FOO_modshare ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
setenv_var __MODULES_SHARE_FOO ":1:http\\://foobar.com:1:http\\://foobar.net:1:http\\://foobar.io:1:http\\://foobar.org:1"
setenv_var FOO ",http://foobar.com,http://foobar.io,http://foobar.org,http://foobar.net"
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "http\\://foobar.net:1:http\\://foobar.org:1"]
lappend ans [list set FOO "http://foobar.org,http://foobar.net"]
lappend ans [list set FOO_modshare "http\\://foobar.net:1:http\\://foobar.org:1"]
testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com,http://foobar.io" $ans ""
testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com http://foobar.io" $ans ""
@@ -113,8 +113,8 @@ testouterr_cmd_re "sh" "remove-path -d , FOO ,http://foobar.com http://foobar.io
setenv_path_var FOO $path1 "/foo" $path1
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:1:/foo:1"]
lappend ans [list set FOO "$path1:/foo"]
lappend ans [list set FOO_modshare "$path1:1:/foo:1"]
testouterr_cmd_re "sh" "remove-path FOO $path1" $ans ""
testouterr_cmd_re "sh" "remove-path --duplicates FOO $path1" $ans "$warn_msgs: --duplicates option has no effect on unload-path"
@@ -124,8 +124,8 @@ testouterr_cmd_re "sh" "remove-path --duplicates FOO $path1" $ans "$warn_msgs: -
#
set ans [list]
lappend ans [list set __MODULES_SHARE_FOO "$path1:2"]
lappend ans [list set FOO "$path1:$path1"]
lappend ans [list set FOO_modshare "$path1:2"]
testouterr_cmd_re "sh" "remove-path --index FOO $path1" "ERR" "$error_msgs: unload-path $msg_valididxvalue"
testouterr_cmd_re "sh" "remove-path --index FOO 1" $ans ""
@@ -134,7 +134,7 @@ testouterr_cmd_re "sh" "remove-path --index FOO 1" $ans ""
# Remove path on DYLD-specific variables
#
setenv_var MODULES_MODSHARE_DYLD_FOO "$path1:2"
setenv_var __MODULES_SHARE_DYLD_FOO "$path1:2"
setenv_var DYLD_FOO $path1
set ans [list]
@@ -142,20 +142,20 @@ set ans [list]
# Integrity Protection (SIP) is enabled: variables are not exported in
# subshell context, so they appear undefined to modulecmd.tcl
if {$sip_enabled} {
lappend ans [list unset __MODULES_SHARE_DYLD_FOO]
lappend ans [list unset DYLD_FOO]
lappend ans [list unset MODULES_MODSHARE_DYLD_FOO]
} else {
lappend ans [list set __MODULES_SHARE_DYLD_FOO "$path1:1"]
lappend ans [list set DYLD_FOO "$path1"]
lappend ans [list set MODULES_MODSHARE_DYLD_FOO "$path1:1"]
}
set tserr "(dyld: warning, unknown environment variable: DYLD_FOO\n|)"
testouterr_cmd_re "sh" "remove-path DYLD_FOO $path1" $ans $tserr
setenv_var MODULES_MODSHARE_DYLD_FOO "$path1:1"
setenv_var __MODULES_SHARE_DYLD_FOO "$path1:1"
set ans [list]
lappend ans [list unset __MODULES_SHARE_DYLD_FOO]
lappend ans [list unset DYLD_FOO]
lappend ans [list unset MODULES_MODSHARE_DYLD_FOO]
testouterr_cmd_re "sh" "remove-path DYLD_FOO $path1" $ans $tserr

8
testsuite/modules.70-maint/210-clear.exp
View File

@@ -28,12 +28,12 @@ setenv_path_var MODULEPATH $mp
# no module loaded
set ans [list]
lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset MODULEPATH_modshare]
lappend ans [list unset __MODULES_LMCONFLICT]
lappend ans [list unset __MODULES_LMALTNAME]
lappend ans [list unset _LMFILES_]
lappend ans [list unset __MODULES_LMPREREQ]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
lappend ans [list unset __MODULES_LMTAG]
lappend ans [list unset __MODULES_LMSOURCESH]
@@ -53,12 +53,12 @@ foreach str [list y Y yes YES Yes yESfoo] {
setenv_loaded_module [list clear/3] [list $mp/clear/3]
set ans [list]
lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset MODULEPATH_modshare]
lappend ans [list unset __MODULES_LMCONFLICT]
lappend ans [list unset __MODULES_LMALTNAME]
lappend ans [list unset _LMFILES_]
lappend ans [list unset __MODULES_LMPREREQ]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
lappend ans [list unset __MODULES_LMTAG]
lappend ans [list unset __MODULES_LMSOURCESH]
testouterr_cmd sh {clear y} $ans {}
@@ -73,14 +73,14 @@ setenv_var __MODULES_LMTAG clear/2&nearly-forbidden
setenv_var __MODULES_LMVARIANT clear/2&foo|val1|0|0
setenv_path_var FOO bar
set ans [list]
lappend ans [list unset __MODULES_SHARE_FOO]
lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset MODULEPATH_modshare]
lappend ans [list unset __MODULES_LMCONFLICT]
lappend ans [list unset __MODULES_LMALTNAME]
lappend ans [list unset FOO_modshare]
lappend ans [list unset _LMFILES_]
lappend ans [list unset __MODULES_LMPREREQ]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
lappend ans [list unset __MODULES_LMTAG]
lappend ans [list unset __MODULES_LMSOURCESH]
testouterr_cmd sh {clear YES} $ans {}

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

@@ -378,7 +378,7 @@ foreach param $statelist {
}
append tserr "\n\n$envvar_header"
set envvar_list [list]
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* *_modshare *_module*] {
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* __MODULES_SHARE_* *_module*] {
set envvar_list [concat $envvar_list [array names env -glob $var]]
}
foreach envvar [lsort -unique $envvar_list] {
@@ -406,7 +406,7 @@ foreach param $statelist {
}
append tserr "\n\n$envvar_header"
set envvar_list [list]
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* *_modshare *_module*] {
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* __MODULES_SHARE_* *_module*] {
set envvar_list [concat $envvar_list [array names env -glob $var]]
}
foreach envvar [lsort -unique $envvar_list] {
@@ -438,7 +438,7 @@ foreach param $statelist {
}
append tserr "\n\n$envvar_header"
set envvar_list [list]
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* *_modshare *_module*] {
foreach var [list LOADEDMODULES _LMFILES_ MODULE* __MODULES_* __MODULES_SHARE_* *_module*] {
set envvar_list [concat $envvar_list [array names env -glob $var]]
}
foreach envvar [lsort -unique $envvar_list] {

2
testsuite/modules.70-maint/280-ml.exp
View File

@@ -281,12 +281,12 @@ testouterr_cmd sh {ml -foo/1 bar/0.2} ERR [msg_load bar/0.2 $tserr]
testinouterr_cmd sh {ml clear} no {} "$info_msgs: Modules runtime information were not cleared"
set ans [list]
lappend ans [list unset __MODULES_LMVARIANT]
lappend ans [list unset MODULEPATH_modshare]
lappend ans [list unset __MODULES_LMCONFLICT]
lappend ans [list unset __MODULES_LMALTNAME]
lappend ans [list unset _LMFILES_]
lappend ans [list unset __MODULES_LMPREREQ]
lappend ans [list unset LOADEDMODULES]
lappend ans [list unset __MODULES_SHARE_MODULEPATH]
lappend ans [list unset __MODULES_LMTAG]
lappend ans [list unset __MODULES_LMSOURCESH]
testinouterr_cmd sh {clear} y $ans {}