Skip to content

Commit 886e06f

Browse files
author
Robert McLay
committed
Merge branch 'main' into PR751
2 parents 2596463 + 1ccb014 commit 886e06f

File tree

18 files changed

+179
-26
lines changed

18 files changed

+179
-26
lines changed

‎messageDir/en.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ To search the contents of modules for matching words execute:
258258
259259
$ module keyword %{s}
260260
]==], --
261-
m_Module_Msgs_close = "%{border}",
261+
m_Module_Msgs_close = "%{border}\n\n",
262262
m_Other_matches = "\n Other possible modules matches:\n %{bb}\n",
263263
m_Other_possible = [==[
264264
Other possible modules matches:

‎rt/common_funcs.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ initStdEnvVars()
288288
unset SHLIB_PATH
289289
unset TERM
290290
unset _LMFILES_
291+
unset LMOD_EXPERT
292+
unset LMOD_QUIET
291293
unset LMOD_CACHED_LOADS
292294
unset LMOD_DISPLAY_META_COLOR
293295
unset LMOD_DISPLAY_SN_COLOR

‎rt/load/err.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
step 1
33
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
44
===========================
5-
Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
5+
Modules based on Lua: Version 8.7.56 2025-02-04 18:12 -07:00
66
by Robert McLay mclay@tacc.utexas.edu
77
===========================
88
step 2
@@ -589,3 +589,7 @@ If the avail list is too long consider trying:
589589
"module overview" or "ml ov" to display the number of modules for each name.
590590
Use "module spider" to find all possible modules and extensions.
591591
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
592+
===========================
593+
step 79
594+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing update
595+
===========================

‎rt/load/load.tdesc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ testdescript = {
144144
runLmod load setPrompt # 76
145145
runLmod list # 77
146146
runLmod avail # 78
147-
147+
runLmod update # 79
148148
149149
150150

‎rt/load/out.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,3 +944,13 @@ MODULEPATH=ProjectDIR/rt/load/mf6;
944944
export MODULEPATH;
945945
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={longVersion={fn="ProjectDIR/rt/load/mf6/longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug.lua",fullName="longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug",loadOrder=1,propT={},stackDepth=0,status="active",userName="longVersion",wV="*branch.60200614194619.*_.*w.000000009.*d.000000009.*a.30560903608993972840.*ea.000000004.*qw.000000004.*d.000000009.*bb.000000443.*debug.*zfinal",},setPrompt={fn="ProjectDIR/rt/load/mf6/setPrompt/1.0.lua",fullName="setPrompt/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="setPrompt",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/load/mf6",},systemBaseMPATH="ProjectDIR/rt/load/mf6",}';
946946
export _ModuleTable_;
947+
===========================
948+
step 79
949+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing update
950+
===========================
951+
MODULEPATH=ProjectDIR/rt/load/mf6;
952+
export MODULEPATH;
953+
MY_PS1=\[\\u@\\h\ \\W\]\\\$\ ;
954+
export MY_PS1;
955+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={longVersion={fn="ProjectDIR/rt/load/mf6/longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug.lua",fullName="longVersion/branch.60200614194619_w9d09a30560903608993972840ea4qw4d9bb0443-debug",loadOrder=1,propT={},stackDepth=0,status="active",userName="longVersion",wV="*branch.60200614194619.*_.*w.000000009.*d.000000009.*a.30560903608993972840.*ea.000000004.*qw.000000004.*d.000000009.*bb.000000443.*debug.*zfinal",},setPrompt={fn="ProjectDIR/rt/load/mf6/setPrompt/1.0.lua",fullName="setPrompt/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="setPrompt",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/load/mf6",},systemBaseMPATH="ProjectDIR/rt/load/mf6",}';
956+
export _ModuleTable_;

‎rt/set_alias/err.txt‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
step 1
33
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
44
===========================
5-
Modules based on Lua: Version 8.6.16 2022-03-22 14:19 -05:00
5+
Modules based on Lua: Version 8.7.56 2025-02-04 18:12 -07:00
66
by Robert McLay mclay@tacc.utexas.edu
77
===========================
88
step 2
@@ -34,6 +34,28 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing load spack
3434
===========================
3535
===========================
3636
step 9
37+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load multiline/3.0
38+
===========================
39+
===========================
40+
step 10
41+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load multiline/2.0
42+
===========================
43+
The following have been reloaded with a version change:
44+
1) multiline/3.0 => multiline/2.0
45+
===========================
46+
step 11
47+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load multiline/1.0
48+
===========================
49+
The following have been reloaded with a version change:
50+
1) multiline/2.0 => multiline/1.0
51+
===========================
52+
step 12
53+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load multiline/4.0
54+
===========================
55+
The following have been reloaded with a version change:
56+
1) multiline/1.0 => multiline/4.0
57+
===========================
58+
step 13
3759
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show showMe
3860
===========================
3961
ProjectDIR/rt/set_alias/mf/showMe/1.0.lua:

‎rt/set_alias/mf/multiline/1.0.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
local _func = [==[
2+
3+
echo foo
4+
5+
]==]
6+
7+
set_shell_function("foo", _func)

‎rt/set_alias/mf/multiline/2.0.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
local _func = [==[
2+
3+
echo foo \
4+
5+
]==]
6+
7+
set_shell_function("foo", _func)

‎rt/set_alias/mf/multiline/3.0.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
local _func = [==[
2+
echo foo
3+
]==]
4+
5+
set_shell_function("foo", _func)

‎rt/set_alias/mf/multiline/4.0.lua‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
local _func = [==[
2+
STR="
3+
foo
4+
bar
5+
"
6+
echo $STR \
7+
8+
9+
10+
11+
12+
]==]
13+
14+
set_shell_function("foo", _func)

0 commit comments

Comments
 (0)