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

ts: adapt tests to new config option home

Browse Source
This commit is contained in:
Xavier Delaruelle
2019-11-13 06:34:00 +01:00
parent a386dbb67c
commit ca0f397045
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testsuite/example/modulerc-1.in
View File

@@ -5,6 +5,7 @@
# val', 'module use path' and 'module load mod'
module config auto_handling 0
module config set_shell_startup 0
module config home @initdir@
@VERSIONING@module use --append {@baseprefix@/$MODULE_VERSION/modulefiles}
@NOTVERSIONING@module use --append {@modulefilesdir@}
module load null

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

@@ -582,8 +582,8 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set ENV $install_initdir/profile.sh]
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULEPATH ""]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -600,8 +600,8 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
if {[is_real_shell $shell] && $install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULEPATH "$install_modulepath:$install_prefix/test/modulefiles:$install_prefix/test/etc"]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -621,8 +621,8 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set _LMFILES_ "$install_modulefilesdir/null"]
lappend ans [list set LOADEDMODULES "null"]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES "null"]
lappend ans [list set MODULEPATH "$install_modulepath"]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -638,8 +638,8 @@ if {(!$insmodspath || $modspath_exinstalled) && (!$insmodrc || $modrc_exinstalle
lappend ans [list set MODULES_SET_SHELL_STARTUP 0]
lappend ans [list set MODULES_AUTO_HANDLING 0]
lappend ans [list set _LMFILES_ "$install_modulefilesdir/null"]
lappend ans [list set LOADEDMODULES "null"]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES "null"]
lappend ans [list set MODULEPATH "$install_modulepath"]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -754,8 +754,8 @@ if {!$insmodspath && $initrc_exinstalled && $modrc eq "$install_etcdir/initrc"}
if {$install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set LOADEDMODULES {}]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES {}]
lappend ans [list set MODULEPATH {}]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -791,8 +791,8 @@ if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modul
if {$install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES ""]
lappend ans [list set MODULEPATH "$install_modulepath:$install_prefix/test/modulefiles:$install_prefix/test/etc"]
if {$install_versioning eq "y"} {
lappend ans [list set MODULE_VERSION "(.*)"]
@@ -827,8 +827,8 @@ if {$insmodspath && $modspath_exinstalled && $modspath eq "$install_etcdir/modul
if {$install_setshellstartup eq {y}} {
lappend ans [list set BASH_ENV $install_initdir/bash]
}
lappend ans [list set LOADEDMODULES {}]
lappend ans [list set MODULESHOME $moduleshome]
lappend ans [list set LOADEDMODULES {}]
lappend ans [list set MODULEPATH {}]
testouterr_cmd_re sh autoinit $ans {}
restore_file_perms $install_etcdir/modulespath

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

@@ -47,6 +47,7 @@ array set configdfl [list\
contact root@localhost\
extended_default [expr {$install_extendeddefault eq {y}}]\
extra_siteconfig <undef>\
home [regsub -all "\(\[.+?\]\)" $install_moduleshome {\\\1}]\
icase $install_icase\
ignored_dirs {CVS RCS SCCS .svn .git .SYNC .sos}\
implicit_default [expr {$install_implicitdefault eq {y}}]\
@@ -76,6 +77,7 @@ array set configvar [list\
contact MODULECONTACT\
extended_default MODULES_EXTENDED_DEFAULT\
extra_siteconfig MODULES_SITECONFIG\
home MODULESHOME\
icase MODULES_ICASE\
implicit_default MODULES_IMPLICIT_DEFAULT\
pager MODULES_PAGER\