From abe236b2a4b7e94304f10bae4bc26bd0bd8232bf Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 3 Oct 2024 15:48:15 -0500 Subject: [PATCH] Issue #690: update gold files w.r.t. type=hard bugfix --- rt/modulerc/err.txt | 14 ++- rt/modulerc/mfD/Core/hard/.modulerc.lua | 2 + rt/modulerc/mfD/Core/hard/1.0.lua | 0 rt/modulerc/mfD/Core/hard/2.0.lua | 0 rt/modulerc/mfD/Core/hardAll/.modulerc.lua | 2 + rt/modulerc/mfD/Core/hardAll/1.0.lua | 0 rt/modulerc/mfD/Core/hardAll/2.0.lua | 0 rt/modulerc/out.txt | 112 +++++++++++++++++++++ 8 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 rt/modulerc/mfD/Core/hard/.modulerc.lua create mode 100644 rt/modulerc/mfD/Core/hard/1.0.lua create mode 100644 rt/modulerc/mfD/Core/hard/2.0.lua create mode 100644 rt/modulerc/mfD/Core/hardAll/.modulerc.lua create mode 100644 rt/modulerc/mfD/Core/hardAll/1.0.lua create mode 100644 rt/modulerc/mfD/Core/hardAll/2.0.lua diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt index 8c9746f28..79584318a 100644 --- a/rt/modulerc/err.txt +++ b/rt/modulerc/err.txt @@ -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 @@ -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 @@ -943,6 +943,8 @@ cluster/a cluster/b cluster/c cluster/.defaultCluster +hard/ +hard/1.0 =========================== step 76 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load C @@ -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. @@ -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. @@ -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 @@ -1087,13 +1093,15 @@ cluster/a cluster/b cluster/c cluster/.defaultCluster +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 diff --git a/rt/modulerc/mfD/Core/hard/.modulerc.lua b/rt/modulerc/mfD/Core/hard/.modulerc.lua new file mode 100644 index 000000000..94f51c857 --- /dev/null +++ b/rt/modulerc/mfD/Core/hard/.modulerc.lua @@ -0,0 +1,2 @@ +hide{name="hard/1.0",kind="hard",notUserA={"lmodTestUser"}} +hide{name="hard/2.0",kind="hard",userA={ "lmodTestUser"}} diff --git a/rt/modulerc/mfD/Core/hard/1.0.lua b/rt/modulerc/mfD/Core/hard/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfD/Core/hard/2.0.lua b/rt/modulerc/mfD/Core/hard/2.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfD/Core/hardAll/.modulerc.lua b/rt/modulerc/mfD/Core/hardAll/.modulerc.lua new file mode 100644 index 000000000..6b907239e --- /dev/null +++ b/rt/modulerc/mfD/Core/hardAll/.modulerc.lua @@ -0,0 +1,2 @@ +hide{name="hardAll/1.0",kind="hard"} +hide{name="hardAll/2.0",kind="hard"} diff --git a/rt/modulerc/mfD/Core/hardAll/1.0.lua b/rt/modulerc/mfD/Core/hardAll/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfD/Core/hardAll/2.0.lua b/rt/modulerc/mfD/Core/hardAll/2.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt index 22a1dedb7..f52996bd3 100644 --- a/rt/modulerc/out.txt +++ b/rt/modulerc/out.txt @@ -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", + }, }, }, } @@ -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, }