390-function.exp (modules-5.1.1.tar.bz2) | : | 390-function.exp (modules-5.2.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 50 | skipping to change at line 50 | |||
set function_fish {eval (echo cd $argv[1])} | set function_fish {eval (echo cd $argv[1])} | |||
set function2_fish {echo $argv[1]} | set function2_fish {echo $argv[1]} | |||
set function3_fish {echo $argv[1] | set function3_fish {echo $argv[1] | |||
echo $argv[2]} | echo $argv[2]} | |||
# | # | |||
# For the different shells ... | # For the different shells ... | |||
# | # | |||
#lappend ans_empty [list function testsuite $function] | #lappend ans_empty [list function testsuite $function] | |||
lappend ans_empty [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_empty [list set _LMFILES_ $modulefile] | lappend ans_empty [list set _LMFILES_ $modulefile] | |||
lappend ans_empty [list set LOADEDMODULES $module] | lappend ans_empty [list set LOADEDMODULES $module] | |||
lappend ans_sh [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_sh [list set _LMFILES_ $modulefile] | lappend ans_sh [list set _LMFILES_ $modulefile] | |||
lappend ans_sh [list set LOADEDMODULES $module] | lappend ans_sh [list set LOADEDMODULES $module] | |||
lappend ans_sh [list testsuite2 "() {" "$function2_sh; };"] | lappend ans_sh [list testsuite2 "() {" "$function2_sh; };"] | |||
lappend ans_sh [list testsuite3 "() {" "$function2_sh; };"] | lappend ans_sh [list testsuite3 "() {" "$function2_sh; };"] | |||
lappend ans_sh [list testsuite4 "() {" "$function2_sh; };"] | lappend ans_sh [list testsuite4 "() {" "$function2_sh; };"] | |||
lappend ans_sh [list testsuite "() {" "$function_sh; };"] | lappend ans_sh [list testsuite "() {" "$function_sh; };"] | |||
lappend ans_sh [list testsuite5 "() {" "$function3_sh; };"] | lappend ans_sh [list testsuite5 "() {" "$function3_sh; };"] | |||
lappend ans_bash [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_bash [list set _LMFILES_ $modulefile] | lappend ans_bash [list set _LMFILES_ $modulefile] | |||
lappend ans_bash [list set LOADEDMODULES $module] | lappend ans_bash [list set LOADEDMODULES $module] | |||
lappend ans_bash [list testsuite2 "() {" "$function2_sh; };" "export -f testsuit e2;"] | lappend ans_bash [list testsuite2 "() {" "$function2_sh; };" "export -f testsuit e2;"] | |||
lappend ans_bash [list testsuite3 "() {" "$function2_sh; };" "export -f testsuit e3;"] | lappend ans_bash [list testsuite3 "() {" "$function2_sh; };" "export -f testsuit e3;"] | |||
lappend ans_bash [list testsuite4 "() {" "$function2_sh; };" "export -f testsuit e4;"] | lappend ans_bash [list testsuite4 "() {" "$function2_sh; };" "export -f testsuit e4;"] | |||
lappend ans_bash [list testsuite "() {" "$function_sh; };" "export -f testsuite; "] | lappend ans_bash [list testsuite "() {" "$function_sh; };" "export -f testsuite; "] | |||
lappend ans_bash [list testsuite5 "() {" "$function3_sh; };" "export -f testsuit e5;"] | lappend ans_bash [list testsuite5 "() {" "$function3_sh; };" "export -f testsuit e5;"] | |||
lappend ans_fish [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_fish [list set _LMFILES_ $modulefile] | lappend ans_fish [list set _LMFILES_ $modulefile] | |||
lappend ans_fish [list set LOADEDMODULES $module] | lappend ans_fish [list set LOADEDMODULES $module] | |||
lappend ans_fish [list function "testsuite2;" "$function2_fish;" "end;"] | lappend ans_fish [list function "testsuite2;" "$function2_fish;" "end;"] | |||
lappend ans_fish [list function "testsuite3;" "$function2_fish;" "end;"] | lappend ans_fish [list function "testsuite3;" "$function2_fish;" "end;"] | |||
lappend ans_fish [list function "testsuite4;" "$function2_fish;" "end;"] | lappend ans_fish [list function "testsuite4;" "$function2_fish;" "end;"] | |||
lappend ans_fish [list function "testsuite;" "$function_fish;" "end;"] | lappend ans_fish [list function "testsuite;" "$function_fish;" "end;"] | |||
lappend ans_fish [list function "testsuite5;" "$function3_fish;" "end;"] | lappend ans_fish [list function "testsuite5;" "$function3_fish;" "end;"] | |||
lappend ans_unsh [list set _LMFILES_ $modulefile] | lappend ans_unsh [list set _LMFILES_ $modulefile] | |||
lappend ans_unsh [list set LOADEDMODULES $module] | lappend ans_unsh [list set LOADEDMODULES $module] | |||
skipping to change at line 114 | skipping to change at line 118 | |||
# Recommended use is to use {} for quoting the function body | # Recommended use is to use {} for quoting the function body | |||
# | # | |||
set module "function/2.0" | set module "function/2.0" | |||
set modulefile "$modpath/$module" | set modulefile "$modpath/$module" | |||
set function_sh {echo $(grep "report .Modules " modulecmd.tcl | tr -d \\ | awk ' {print $3}'); echo $1} | set function_sh {echo $(grep "report .Modules " modulecmd.tcl | tr -d \\ | awk ' {print $3}'); echo $1} | |||
set function_fish {echo (grep "report .Modules " modulecmd.tcl | tr -d \\ | awk '{print $3}'); echo $argv[1]} | set function_fish {echo (grep "report .Modules " modulecmd.tcl | tr -d \\ | awk '{print $3}'); echo $argv[1]} | |||
set ans_empty [list] | set ans_empty [list] | |||
lappend ans_empty [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_empty [list set _LMFILES_ $modulefile] | lappend ans_empty [list set _LMFILES_ $modulefile] | |||
lappend ans_empty [list set LOADEDMODULES $module] | lappend ans_empty [list set LOADEDMODULES $module] | |||
set ans_sh [list] | set ans_sh [list] | |||
lappend ans_sh [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_sh [list set _LMFILES_ $modulefile] | lappend ans_sh [list set _LMFILES_ $modulefile] | |||
lappend ans_sh [list set LOADEDMODULES $module] | lappend ans_sh [list set LOADEDMODULES $module] | |||
lappend ans_sh [list testsuite "() {" "$function_sh; };"] | lappend ans_sh [list testsuite "() {" "$function_sh; };"] | |||
set ans_bash [list] | set ans_bash [list] | |||
lappend ans_bash [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_bash [list set _LMFILES_ $modulefile] | lappend ans_bash [list set _LMFILES_ $modulefile] | |||
lappend ans_bash [list set LOADEDMODULES $module] | lappend ans_bash [list set LOADEDMODULES $module] | |||
lappend ans_bash [list testsuite "() {" "$function_sh; };" "export -f testsuite; "] | lappend ans_bash [list testsuite "() {" "$function_sh; };" "export -f testsuite; "] | |||
set ans_fish [list] | set ans_fish [list] | |||
lappend ans_fish [list set __MODULES_LMREFRESH $module] | ||||
lappend ans_fish [list set _LMFILES_ $modulefile] | lappend ans_fish [list set _LMFILES_ $modulefile] | |||
lappend ans_fish [list set LOADEDMODULES $module] | lappend ans_fish [list set LOADEDMODULES $module] | |||
lappend ans_fish [list function "testsuite;" "$function_fish;" "end;"] | lappend ans_fish [list function "testsuite;" "$function_fish;" "end;"] | |||
foreach sh $supported_shells { | foreach sh $supported_shells { | |||
switch -- $sh { | switch -- $sh { | |||
{bash} { | {bash} { | |||
test_cmd $sh "load $module" $ans_bash | test_cmd $sh "load $module" $ans_bash | |||
} | } | |||
{sh} - {ksh} - {zsh} { | {sh} - {ksh} - {zsh} { | |||
End of changes. 8 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added |