envmodules/modules
1
0
Fork 0
mirror of https://github.com/envmodules/modules.git synced 2026-05-30 00:12:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ts: adapt source-sh results if mogui is defined prior tests

Browse Source
This commit is contained in:
Xavier Delaruelle
2024-04-02 08:21:48 +02:00
parent e70de65618
commit 9aa5f9d948
11 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testsuite/example/sh-to-mod.csh
View File

@@ -97,6 +97,7 @@ if ( $?TESTSUITE_SHTOMOD_MODULE ) then
module load setenv/1.0
unalias ml
unalias module
unalias mogui
unsetenv MODULESHOME
endif

2
testsuite/example/sh-to-mod.fish
View File

@@ -124,7 +124,7 @@ if set -q TESTSUITE_SHTOMOD_MODULE
eval $TCLSH $MODULES_CMD fish autoinit | source -
module config collection_target bar
module load setenv/1.0
functions -e ml module _module_raw
functions -e ml module _module_raw mogui
set -e MODULESHOME
end

2
testsuite/example/sh-to-mod.sh
View File

@@ -110,7 +110,7 @@ if [ "${TESTSUITE_SHTOMOD_MODULE:+x}" = 'x' ]; then
eval $($TCLSH $MODULES_CMD sh autoinit)
module config collection_target bar
module load setenv/1.0
unset -f ml module _module_raw
unset -f ml module _module_raw mogui
unset MODULESHOME
fi

2
testsuite/is_func_defined Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
type "$1" >/dev/null 2>&1

2
testsuite/is_func_defined.fish Executable file
View File

@@ -0,0 +1,2 @@
#!/usr/bin/fish
type -q "$argv[1]"

2
testsuite/is_module_defined
View File

@@ -1,2 +0,0 @@
#!/bin/bash
type module >/dev/null 2>&1

2
testsuite/is_module_defined.fish
View File

@@ -1,2 +0,0 @@
#!/usr/bin/fish
type -q module

10
testsuite/modules.00-init/005-init_ts.exp
View File

@@ -199,8 +199,14 @@ unset orig_perms
unset new_perms
# check if module command is defined prior running tests
set is_modules_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_module_defined}]}]
set is_modules_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_module_defined.fish}]}]
set is_modules_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined module}]}]
set is_modules_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined.fish module}]}]
send_user "\tModules is defined in SH env prior tests: $is_modules_defined\n"
send_user "\tModules is defined in FISH env prior tests: $is_modules_defined_fish\n"
set is_mogui_defined [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined mogui}]}]
set is_mogui_defined_fish [expr {![catch {exec $env(TESTSUITEDIR)/is_func_defined.fish mogui}]}]
send_user "\tMoGui is defined in SH env prior tests: $is_mogui_defined\n"
send_user "\tMoGui is defined in FISH env prior tests: $is_mogui_defined_fish\n"
# check if symbolic link registered in git repository have been effectively
# created as symbolic link to determine if they are supported on filesystem

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

@@ -1664,6 +1664,9 @@ lappend ans [list set MODULES_COLLECTION_TARGET bar]
# will be the unset of the module functions
if {$is_modules_defined} {
set extraans \|unset-function\ _module_raw\|unset-function\ ml\|unset-function\ module
if {$is_mogui_defined} {
append extraans \|unset-function\ mogui
}
} else {
set extraans {}
}
@@ -1676,6 +1679,9 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION $install_version]
}
if {$is_modules_defined} {
if {$is_mogui_defined} {
lappend ans [list {unset -f mogui 2>/dev/null || true;}]
}
lappend ans [list {unset -f ml 2>/dev/null || true;}]
lappend ans [list {unset -f module 2>/dev/null || true;}]
lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]
@@ -1687,6 +1693,9 @@ set extratserr "
unset-function\t_module_raw
unset-function\tml
unset-function\tmodule"
if {$is_mogui_defined} {
append extratserr "\nunset-function\tmogui"
}
} else {
set extratserr {}
}
@@ -1766,6 +1775,9 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION $install_version]
}
if {$is_modules_defined} {
if {$is_mogui_defined} {
lappend ans [list {unset -f mogui 2>/dev/null || true;}]
}
lappend ans [list {unset -f ml 2>/dev/null || true;}]
lappend ans [list {unset -f module 2>/dev/null || true;}]
lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]
@@ -1801,6 +1813,9 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION $install_version]
}
if {$is_modules_defined} {
if {$is_mogui_defined} {
lappend ans [list {unset -f mogui 2>/dev/null || true;}]
}
lappend ans [list {unset -f ml 2>/dev/null || true;}]
lappend ans [list {unset -f module 2>/dev/null || true;}]
lappend ans [list {unset -f _module_raw 2>/dev/null || true;}]

9
testsuite/modules.70-maint/310-sh-to-mod.exp
View File

@@ -797,11 +797,18 @@ setenv_var TCLSH $TCLSH
# will be the unset of the module functions
if {$is_modules_defined} {
set extratserr "\nunset-function\t_module_raw\nunset-function\tml\nunset-function\tmodule"
if {$is_mogui_defined} {
append extratserr "\nunset-function\tmogui"
}
} else {
set extratserr {}
}
if {$is_modules_defined_fish && ![string match "CYGWIN*" $tcl_platform(os)]} {
set extratserr_fish "\nunset-function\tml\nunset-function\tmodule\nunsetenv\tMODULESHOME"
set extratserr_fish "\nunset-function\tml\nunset-function\tmodule"
if {$is_mogui_defined} {
append extratserr_fish "\nunset-function\tmogui"
}
append extratserr_fish "\nunsetenv\tMODULESHOME"
} else {
set extratserr_fish {}
}

3
testsuite/modules.70-maint/311-eval-sh-to-mod.exp
View File

@@ -481,6 +481,9 @@ setenv_var TCLSH $TCLSH
# will be the unset of the module functions
if {$is_modules_defined} {
set extratserr "\nunset-function\t_module_raw\nunset-function\tml\nunset-function\tmodule"
if {$is_mogui_defined} {
append extratserr "\nunset-function\tmogui"
}
} else {
set extratserr {}
}