Skip to content

Commit

Permalink
Issue #690: update gold files w.r.t. type=hard bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Oct 3, 2024
1 parent b343079 commit abe236b
Show file tree
Hide file tree
Showing 8 changed files with 127 additions and 3 deletions.
14 changes: 11 additions & 3 deletions rt/modulerc/err.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ step 73
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail
===========================
ProjectDIR/rt/modulerc/mfD/Core
C/1.0 C/3.0 (F,D) F/1.0 (NF) cluster/b
C/1.0 C/3.0 (F,D) F/1.0 (NF) cluster/b hard/1.0
C/2.0 D/3.0 (NF) cluster/a cluster/c
Where:
D: Default Module
Expand All @@ -910,7 +910,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail
===========================
ProjectDIR/rt/modulerc/mfD/Core
C/1.0 D/3.0 (NF) cluster/a cluster/.defaultCluster (H,F,D)
C/2.0 F/1.0 (NF) cluster/b
C/2.0 F/1.0 (NF) cluster/b hard/1.0
C/3.0 (F,D) H/1.0 (s) cluster/c
Where:
D: Default Module
Expand Down Expand Up @@ -943,6 +943,8 @@ cluster/a
cluster/b
cluster/c
cluster/.defaultCluster <H> <F>
hard/
hard/1.0
===========================
step 76
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load C
Expand Down Expand Up @@ -1030,6 +1032,7 @@ The following is a list of the modules and extensions currently available:
D: D/3.0
F: F/1.0
cluster: cluster/a, cluster/b, cluster/c
hard: hard/1.0
To learn more about a package execute:
$ module spider Foo
where "Foo" is the name of a module.
Expand All @@ -1046,6 +1049,7 @@ The following is a list of the modules and extensions currently available:
F: F/1.0
H: H/1.0
cluster: cluster/a, cluster/b, cluster/c, cluster/.defaultCluster
hard: hard/1.0
To learn more about a package execute:
$ module spider Foo
where "Foo" is the name of a module.
Expand All @@ -1068,6 +1072,8 @@ cluster/
cluster/a
cluster/b
cluster/c
hard/
hard/1.0
===========================
step 86
lua ProjectDIR/src/lmod.in.lua shell --regression_testing -t -A spider
Expand All @@ -1087,13 +1093,15 @@ cluster/a
cluster/b
cluster/c
cluster/.defaultCluster <H> <F>
hard/
hard/1.0
===========================
step 87
lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A avail
===========================
ProjectDIR/rt/modulerc/mfD/Core
C/1.0 D/3.0 (NF,L) cluster/a cluster/.defaultCluster (H,F,D)
C/2.0 F/1.0 (NF) cluster/b
C/2.0 F/1.0 (NF) cluster/b hard/1.0
C/3.0 (F,D) H/1.0 (s,L) cluster/c
Where:
D: Default Module
Expand Down
2 changes: 2 additions & 0 deletions rt/modulerc/mfD/Core/hard/.modulerc.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hide{name="hard/1.0",kind="hard",notUserA={"lmodTestUser"}}
hide{name="hard/2.0",kind="hard",userA={ "lmodTestUser"}}
Empty file added rt/modulerc/mfD/Core/hard/1.0.lua
View file
Empty file.
Empty file added rt/modulerc/mfD/Core/hard/2.0.lua
View file
Empty file.
2 changes: 2 additions & 0 deletions rt/modulerc/mfD/Core/hardAll/.modulerc.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hide{name="hardAll/1.0",kind="hard"}
hide{name="hardAll/2.0",kind="hard"}
Empty file added rt/modulerc/mfD/Core/hardAll/1.0.lua
View file
Empty file.
Empty file added rt/modulerc/mfD/Core/hardAll/2.0.lua
View file
Empty file.
112 changes: 112 additions & 0 deletions rt/modulerc/out.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2252,6 +2252,32 @@ mrcMpathT = {
kind = "soft",
name = "H",
},
["hard/1.0"] = {
action = "hide",
kind = "hard",
name = "hard/1.0",
notUserT = {
lmodTestUser = true,
},
},
["hard/2.0"] = {
action = "hide",
kind = "hard",
name = "hard/2.0",
userT = {
lmodTestUser = true,
},
},
["hardAll/1.0"] = {
action = "hide",
kind = "hard",
name = "hardAll/1.0",
},
["hardAll/2.0"] = {
action = "hide",
kind = "hard",
name = "hardAll/2.0",
},
},
},
}
Expand Down Expand Up @@ -2506,6 +2532,92 @@ spiderT = {
},
},
},
hard = {
defaultA = {
{
barefn = ".modulerc.lua",
defaultIdx = 2,
fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/.modulerc.lua",
fullName = "hard/.modulerc",
luaExt = 10,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
value = false,
},
},
defaultT = {
barefn = ".modulerc.lua",
defaultIdx = 2,
fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/.modulerc.lua",
fullName = "hard/.modulerc",
luaExt = 10,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
value = false,
},
dirT = {},
fileT = {
["hard/1.0"] = {
Version = "1.0",
canonical = "1.0",
fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/1.0.lua",
luaExt = 4,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
pV = "000000001.*zfinal",
wV = "000000001.*zfinal",
},
["hard/2.0"] = {
Version = "2.0",
canonical = "2.0",
fn = "ProjectDIR/rt/modulerc/mfD/Core/hard/2.0.lua",
luaExt = 4,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
pV = "000000002.*zfinal",
wV = "000000002.*zfinal",
},
},
},
hardAll = {
defaultA = {
{
barefn = ".modulerc.lua",
defaultIdx = 2,
fn = "ProjectDIR/rt/modulerc/mfD/Core/hardAll/.modulerc.lua",
fullName = "hardAll/.modulerc",
luaExt = 10,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
value = false,
},
},
defaultT = {
barefn = ".modulerc.lua",
defaultIdx = 2,
fn = "ProjectDIR/rt/modulerc/mfD/Core/hardAll/.modulerc.lua",
fullName = "hardAll/.modulerc",
luaExt = 10,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
value = false,
},
dirT = {},
fileT = {
["hardAll/1.0"] = {
Version = "1.0",
canonical = "1.0",
fn = "ProjectDIR/rt/modulerc/mfD/Core/hardAll/1.0.lua",
luaExt = 4,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
pV = "000000001.*zfinal",
wV = "000000001.*zfinal",
},
["hardAll/2.0"] = {
Version = "2.0",
canonical = "2.0",
fn = "ProjectDIR/rt/modulerc/mfD/Core/hardAll/2.0.lua",
luaExt = 4,
mpath = "ProjectDIR/rt/modulerc/mfD/Core",
pV = "000000002.*zfinal",
wV = "000000002.*zfinal",
},
},
},
},
version = 5,
}
Expand Down

0 comments on commit abe236b

Please sign in to comment.