Skip to content

Commit 9835ad6

Browse files
author
Robert McLay
committed
merging Issue #800 changes
2 parents 53be9ef + 7bab2bb commit 9835ad6

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

proj_mgmt/clean_gold_files/Cleanup.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
local posix = require("posix")
32
_G._DEBUG = false
43

rt/ck_mtree_syntax/err.txt

Lines changed: 1 addition & 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 9.0.2 2025-10-20 21:00 -05:00
66
https://lmod.readthedocs.io
77
===========================
88
step 2

rt/ck_mtree_syntax/out.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
66
step 2
77
lua ProjectDIR/src/check_module_tree_syntax.in.lua ProjectDIR/rt/ck_mtree_syntax/mf
88
===========================
9-
There were 5 possible errors found!
9+
There were 5 possible errors found!
1010
===========================
1111
step 3
1212
runSpiderCmd -o spiderT ProjectDIR/rt/ck_mtree_syntax/mf

rt/oscar/err.txt

Lines changed: 2 additions & 2 deletions
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.61 2025-06-20 16:09 -05:00
5+
Modules based on Lua: Version 9.0.2 2025-10-20 21:00 -05:00
66
https://lmod.readthedocs.io
77
===========================
88
step 2
@@ -13,7 +13,7 @@ step 3
1313
lua ProjectDIR/src/lmod.in.lua shell --regression_testing show oscar
1414
===========================
1515
ProjectDIR/rt/oscar/mf/Core/oscar.lua:
16-
help([[ This module sets up the OSCAR modules subsystem.]])
16+
help([[ This module sets up the OSCAR modules subsystem.]])
1717
whatis("Description: Sets up the OSCAR modules subsystem.")
1818
prepend_path("MODULEPATH","ProjectDIR/rt/oscar/mf/Oscar")
1919
load("a")

rt/tacc/err.txt

Lines changed: 9 additions & 9 deletions
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.61 2025-06-20 16:09 -05:00
5+
Modules based on Lua: Version 9.0.2 2025-10-20 21:00 -05:00
66
https://lmod.readthedocs.io
77
===========================
88
step 2
@@ -29,14 +29,14 @@ step 4
2929
lua ProjectDIR/src/lmod.in.lua shell --regression_testing help mvapich1
3030
===========================
3131
Module Specific Help for "mvapich1/mvapich1"
32-
This module loads the MVAPICH MPI environment built with
33-
Intel compilers. By loading this module, the following commands
34-
will be automatically available for compiling MPI applications:
35-
mpif77 (F77 source)
36-
mpif90 (F90 source)
37-
mpicc ( C source)
38-
mpiCC/mpicxx (C++ source)
39-
Version 1.0.1
32+
This module loads the MVAPICH MPI environment built with
33+
Intel compilers. By loading this module, the following commands
34+
will be automatically available for compiling MPI applications:
35+
mpif77 (F77 source)
36+
mpif90 (F90 source)
37+
mpicc ( C source)
38+
mpiCC/mpicxx (C++ source)
39+
Version 1.0.1
4040
===========================
4141
step 5
4242
lua ProjectDIR/src/lmod.in.lua shell --regression_testing list

tools/MF_Base.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@ local function l_extractFuncs(shellName, funcs)
179179
local is, ie, Nm, Strt = funcs:find(namePatt)
180180
if (not is) then break end
181181
local js, je, End = funcs:find(trailingPatt, ie+1)
182-
--funcT[Nm] = funcs:sub(ie+1,js):gsub("\t"," ")
183-
funcT[Nm] = funcs:sub(ie+1,js) --:gsub("\t"," ")
182+
funcT[Nm] = funcs:sub(ie+1,js)
184183
funcs = funcs:sub(je+1,-1)
185184
end
186185

0 commit comments

Comments
 (0)