Issue #690: nolonger write out mrcT just mrcMpathT

TACC · Oct 3, 2024 · e3ea8c4 · e3ea8c4
1 parent abe236b
commit e3ea8c4
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 227 deletions.
diff --git a/rt/cached_loads/cached_loads.tdesc b/rt/cached_loads/cached_loads.tdesc
@@ -24,7 +24,7 @@ testdescript = {
 
      cacheDir=`userCacheDir`
 
-     remove_generated_lmod_files
+     remove_generated_lmod_files mf/Core/B
      
      runLmod --version              # 1
 

diff --git a/rt/ck_mtree_syntax/err.txt b/rt/ck_mtree_syntax/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.48 2024-08-19 16:18 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2

diff --git a/rt/ck_mtree_syntax/out.txt b/rt/ck_mtree_syntax/out.txt
@@ -14,11 +14,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/ck_mtree_syntax/mf
 timestampFn = {
   false,
 }
-mrcT = {
-  alias2modT = {},
-  hiddenT = {},
-  version2modT = {},
-}
 mrcMpathT = {}
 spiderT = {
   ["ProjectDIR/rt/ck_mtree_syntax/mf"] = {

diff --git a/rt/common_funcs.sh b/rt/common_funcs.sh
@@ -31,8 +31,8 @@ cleanUp ()
        -e "s|\o033|\\\033|g"                              \
        -e "s|[\\]27|\\\033|g"                             \
        -e "s|='\\\\033|='\\\\\\\\033|g"                   \
-       -e "s|[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]|YYYY-MM-DDTHH:mm|g" \
-       -e "s|[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]|YYYY-MM-DD|g" \
+       -e "s|\"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]\"|\"YYYY-MM-DDTHH:mm\"|g" \
+       -e "s|\"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\"|\"YYYY-MM-DD\"|g" \
        -e "s|^User shell.*||"                             \
        -e "s|\@git\@|$gitV|g"                             \
        -e "s| $PATH_to_SHA1/$SHA1SUM| PATH_to_HASHSUM|g"  \

diff --git a/rt/dbT/err.txt b/rt/dbT/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2

diff --git a/rt/dbT/out.txt b/rt/dbT/out.txt
@@ -27,11 +27,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/dbT/mf4
 timestampFn = {
   false,
 }
-mrcT = {
-  alias2modT = {},
-  hiddenT = {},
-  version2modT = {},
-}
 mrcMpathT = {
   ["ProjectDIR/rt/dbT/mf3"] = {
     hiddenT = {

diff --git a/rt/help/err.txt b/rt/help/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2
@@ -31,6 +31,7 @@ Options:
   -r --regexp                       use regular expression match
   --gitversion                      Dump git version in a machine readable way and quit
   --dumpversion                     Dump version in a machine readable way and quit
+  --dumpname                        Dump the name Lmod in a machine readable way and quit
   --check_syntax --checkSyntax      Checking module command syntax: do not load
   --config                          Report Lmod Configuration
   --miniConfig                      Report Lmod Configuration differences
@@ -109,7 +110,7 @@ Lmod Web Sites
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 3
@@ -138,6 +139,7 @@ Options:
   -r --regexp                       use regular expression match
   --gitversion                      Dump git version in a machine readable way and quit
   --dumpversion                     Dump version in a machine readable way and quit
+  --dumpname                        Dump the name Lmod in a machine readable way and quit
   --check_syntax --checkSyntax      Checking module command syntax: do not load
   --config                          Report Lmod Configuration
   --miniConfig                      Report Lmod Configuration differences
@@ -216,7 +218,7 @@ Lmod Web Sites
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 4
@@ -236,7 +238,7 @@ Version 9
 step 5
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --config
 ===========================
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 Description                                                   Value
 Allow root to use Lmod (LMOD_ALLOW_ROOT_USE)                  yes
@@ -419,7 +421,7 @@ propT = {
 step 6
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --miniConfig
 ===========================
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 LMOD_PACKAGE_PATH            D          nil          <empty>
 LMOD_SYSTEM_DEFAULT_MODULES  D          __unknown__  <empty>
@@ -478,6 +480,8 @@ use regular expression match
 Dump git version in a machine readable way and quit
 =item I<--dumpversion>
 Dump version in a machine readable way and quit
+=item I<--dumpname>
+Dump the name Lmod in a machine readable way and quit
 =item I<--check_syntax --checkSyntax>
 Checking module command syntax: do not load
 =item I<--config>

diff --git a/rt/i18n/err.txt b/rt/i18n/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2
@@ -73,6 +73,7 @@ Options:
   -r --regexp                       Fait une recherche par expression régulière
   --gitversion                      Affiche la version git dans un format lisible par l'ordinateur
   --dumpversion                     Affiche la version dans un format lisible par l'ordinateur
+  --dumpname                        Dump the name Lmod in a machine readable way and quit
   --check_syntax --checkSyntax      Vérifie la syntaxe, ne charge pas le module
   --config                          Affiche la configuration Lmod
   --miniConfig                      Report Lmod Configuration differences
@@ -151,5 +152,5 @@ Sites web de Lmod
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   Pour rapporter un bogue, veuillez lire https://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
diff --git a/rt/meta/err.txt b/rt/meta/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2

diff --git a/rt/meta/out.txt b/rt/meta/out.txt
@@ -225,11 +225,6 @@ runSpiderCmd -o spiderT ProjectDIR/rt/meta/MF_FOO/A:ProjectDIR/rt/meta/MF_FOO/B
 timestampFn = {
   false,
 }
-mrcT = {
-  alias2modT = {},
-  hiddenT = {},
-  version2modT = {},
-}
 mrcMpathT = {}
 spiderT = {
   ["ProjectDIR/rt/meta/MF_FOO/A"] = {

diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.49 YYYY-MM-DD 13:55 -06:00
+Modules based on Lua: Version 8.7.49 2024-08-30 13:55 -06:00
     by Robert McLay [email protected]
 ===========================
 step 2
@@ -893,8 +893,8 @@ 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    hard/1.0
-   C/2.0    D/3.0 (NF)     cluster/a         cluster/c
+   C/1.0    C/3.0 (F,D)    F/1.0 (NF)    cluster/a    cluster/c
+   C/2.0    D/3.0 (NF)     G/2.0         cluster/b    hard/1.0
   Where:
    D:   Default Module
    F:   Forbidden Module
@@ -909,9 +909,10 @@ step 74
 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    hard/1.0
-   C/3.0 (F,D)    H/1.0 (s)     cluster/c
+   C/1.0          F/1.0 (NF)    cluster/a                          hard/1.0
+   C/2.0          G/1.0 (H)     cluster/b
+   C/3.0 (F,D)    G/2.0 (D)     cluster/c
+   D/3.0 (NF)     H/1.0 (s)     cluster/.defaultCluster (H,F,D)
   Where:
    D:   Default Module
    F:   Forbidden Module
@@ -936,6 +937,9 @@ D/
 D/3.0 <NF>
 F/
 F/1.0 <NF>
+G/
+G/1.0 <H>
+G/2.0
 H/
 H/1.0 <H>
 cluster/
@@ -959,7 +963,7 @@ Lmod has detected the following error: You must pick a cluster
 step 78
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D H/1.0
 ===========================
-Access will be denied to this module starting YYYY-MM-DD
+Access will be denied to this module starting 3000-01-01
 ===========================
 step 79
 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list
@@ -1031,6 +1035,7 @@ The following is a list of the modules and extensions currently available:
   C: C/1.0, C/2.0, C/3.0
   D: D/3.0
   F: F/1.0
+  G: G/2.0
   cluster: cluster/a, cluster/b, cluster/c
   hard: hard/1.0
 To learn more about a package execute:
@@ -1047,6 +1052,7 @@ The following is a list of the modules and extensions currently available:
   C: C/1.0, C/2.0, C/3.0
   D: D/3.0
   F: F/1.0
+  G: G/1.0, G/2.0
   H: H/1.0
   cluster: cluster/a, cluster/b, cluster/c, cluster/.defaultCluster
   hard: hard/1.0
@@ -1068,6 +1074,8 @@ D/
 D/3.0 <NF>
 F/
 F/1.0 <NF>
+G/
+G/2.0
 cluster/
 cluster/a
 cluster/b
@@ -1086,6 +1094,9 @@ D/
 D/3.0 <NF>
 F/
 F/1.0 <NF>
+G/
+G/1.0 <H>
+G/2.0
 H/
 H/1.0 <H>
 cluster/
@@ -1100,9 +1111,10 @@ 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    hard/1.0
-   C/3.0 (F,D)    H/1.0 (s,L)     cluster/c
+   C/1.0           F/1.0 (NF)     cluster/a                          hard/1.0
+   C/2.0           G/1.0 (H)      cluster/b
+   C/3.0 (F,D)     G/2.0 (D)      cluster/c
+   D/3.0 (NF,L)    H/1.0 (s,L)    cluster/.defaultCluster (H,F,D)
   Where:
    D:   Default Module
    F:   Forbidden Module

diff --git a/rt/modulerc/mfD/Core/G/.modulerc.lua b/rt/modulerc/mfD/Core/G/.modulerc.lua
@@ -0,0 +1,2 @@
+local MROOT=os.getenv("MODULEPATH_ROOT")
+hide{name=pathJoin(MROOT,"Core/G","1.0")}
diff --git a/rt/modulerc/mfD/Core/G/1.0.lua b/rt/modulerc/mfD/Core/G/1.0.lua
diff --git a/rt/modulerc/mfD/Core/G/2.0.lua b/rt/modulerc/mfD/Core/G/2.0.lua
diff --git a/rt/modulerc/mfD/Core/hardAll/.modulerc.lua b/rt/modulerc/mfD/Core/hardAll/.modulerc.lua
@@ -1,2 +1 @@
-hide{name="hardAll/1.0",kind="hard"}
-hide{name="hardAll/2.0",kind="hard"}
+hide{name="hardAll",kind="hard"}