Skip to content

Commit 0cbdf1e

Browse files
author
Robert McLay
committed
Merge branch 'main' into IS765-nvv
2 parents 1a3a525 + 1df11b7 commit 0cbdf1e

File tree

9 files changed

+228
-1
lines changed

9 files changed

+228
-1
lines changed

‎rt/common_funcs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ cleanUp ()
9595
-e "s| *----* *||g" \
9696
-e "s|^ *=============================* *|=============================|g" \
9797
-e "s|^--* *| |g" \
98-
-e "s|--* *$||g" \
98+
-e "s|---* *$||g" \
9999
-e "s|\\\9| |g" \
100100
-e "s|$old|$new|g" \
101101
-e "s|^ *OutputDIR| OutputDIR|" \

‎rt/regexp/err.txt‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
===========================
2+
step 1
3+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
4+
===========================
5+
Modules based on Lua: Version 8.7.60 2025-04-30 12:50 -05:00
6+
by Robert McLay mclay@tacc.utexas.edu
7+
===========================
8+
step 2
9+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail
10+
===========================
11+
ProjectDIR/rt/regexp/mf/Core
12+
a-b/1-1 a/1.0 ab-/1.0 ab-/2.0-1 (D) ab/1.0
13+
Where:
14+
D: Default Module
15+
If the avail list is too long consider trying:
16+
"module --default avail" or "ml -d av" to just list the default modules.
17+
"module overview" or "ml ov" to display the number of modules for each name.
18+
Use "module spider" to find all possible modules and extensions.
19+
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
20+
===========================
21+
step 3
22+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a-b
23+
===========================
24+
ProjectDIR/rt/regexp/mf/Core
25+
a-b/1-1
26+
If the avail list is too long consider trying:
27+
"module --default avail" or "ml -d av" to just list the default modules.
28+
"module overview" or "ml ov" to display the number of modules for each name.
29+
Use "module spider" to find all possible modules and extensions.
30+
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
31+
===========================
32+
step 4
33+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a-b/1-1
34+
===========================
35+
ProjectDIR/rt/regexp/mf/Core
36+
a-b/1-1
37+
If the avail list is too long consider trying:
38+
"module --default avail" or "ml -d av" to just list the default modules.
39+
"module overview" or "ml ov" to display the number of modules for each name.
40+
Use "module spider" to find all possible modules and extensions.
41+
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
42+
===========================
43+
step 5
44+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a
45+
===========================
46+
ProjectDIR/rt/regexp/mf/Core
47+
a-b/1-1 a/1.0 ab-/1.0 ab-/2.0-1 (D) ab/1.0
48+
Where:
49+
D: Default Module
50+
If the avail list is too long consider trying:
51+
"module --default avail" or "ml -d av" to just list the default modules.
52+
"module overview" or "ml ov" to display the number of modules for each name.
53+
Use "module spider" to find all possible modules and extensions.
54+
Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
55+
===========================
56+
step 6
57+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ab-
58+
===========================
59+
===========================
60+
step 7
61+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ab
62+
===========================
63+
===========================
64+
step 8
65+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing ov
66+
===========================
67+
ProjectDIR/rt/regexp/mf/Core
68+
a-b (1) a (1) ab- (2) ab (1)
69+
===========================
70+
step 9
71+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing ov ab-
72+
===========================
73+
ProjectDIR/rt/regexp/mf/Core
74+
ab- (2)
75+
===========================
76+
step 10
77+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing spider a-b
78+
===========================
79+
a-b: a-b/1-1
80+
This module can be loaded directly: module load a-b/1-1

‎rt/regexp/mf/Core/a-b/1-1.lua‎

Whitespace-only changes.

‎rt/regexp/mf/Core/a/1.0.lua‎

Whitespace-only changes.

‎rt/regexp/mf/Core/ab-/1.0.lua‎

Whitespace-only changes.

‎rt/regexp/mf/Core/ab-/2.0-1.lua‎

Whitespace-only changes.

‎rt/regexp/mf/Core/ab/1.0.lua‎

Whitespace-only changes.

‎rt/regexp/out.txt‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
===========================
2+
step 1
3+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version
4+
===========================
5+
===========================
6+
step 2
7+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail
8+
===========================
9+
__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/regexp/mf/Core:1;
10+
export __LMOD_REF_COUNT_MODULEPATH;
11+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
12+
export MODULEPATH;
13+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
14+
export _ModuleTable_;
15+
===========================
16+
step 3
17+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a-b
18+
===========================
19+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
20+
export MODULEPATH;
21+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
22+
export _ModuleTable_;
23+
===========================
24+
step 4
25+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a-b/1-1
26+
===========================
27+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
28+
export MODULEPATH;
29+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
30+
export _ModuleTable_;
31+
===========================
32+
step 5
33+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail a
34+
===========================
35+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
36+
export MODULEPATH;
37+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
38+
export _ModuleTable_;
39+
===========================
40+
step 6
41+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ab-
42+
===========================
43+
LOADEDMODULES=ab-/2.0-1;
44+
export LOADEDMODULES;
45+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
46+
export MODULEPATH;
47+
_LMFILES_=ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua;
48+
export _LMFILES_;
49+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={["ab-"]={fn="ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua",fullName="ab-/2.0-1",loadOrder=1,propT={},stackDepth=0,status="active",userName="ab-",wV="000000002.*zfinal-.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
50+
export _ModuleTable_;
51+
===========================
52+
step 7
53+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ab
54+
===========================
55+
LOADEDMODULES=ab-/2.0-1:ab/1.0;
56+
export LOADEDMODULES;
57+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
58+
export MODULEPATH;
59+
_LMFILES_=ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua:ProjectDIR/rt/regexp/mf/Core/ab/1.0.lua;
60+
export _LMFILES_;
61+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ab={fn="ProjectDIR/rt/regexp/mf/Core/ab/1.0.lua",fullName="ab/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="ab",wV="000000001.*zfinal",},["ab-"]={fn="ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua",fullName="ab-/2.0-1",loadOrder=1,propT={},stackDepth=0,status="active",userName="ab-",wV="000000002.*zfinal-.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
62+
export _ModuleTable_;
63+
===========================
64+
step 8
65+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing ov
66+
===========================
67+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
68+
export MODULEPATH;
69+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ab={fn="ProjectDIR/rt/regexp/mf/Core/ab/1.0.lua",fullName="ab/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="ab",wV="000000001.*zfinal",},["ab-"]={fn="ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua",fullName="ab-/2.0-1",loadOrder=1,propT={},stackDepth=0,status="active",userName="ab-",wV="000000002.*zfinal-.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
70+
export _ModuleTable_;
71+
===========================
72+
step 9
73+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing ov ab-
74+
===========================
75+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
76+
export MODULEPATH;
77+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ab={fn="ProjectDIR/rt/regexp/mf/Core/ab/1.0.lua",fullName="ab/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="ab",wV="000000001.*zfinal",},["ab-"]={fn="ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua",fullName="ab-/2.0-1",loadOrder=1,propT={},stackDepth=0,status="active",userName="ab-",wV="000000002.*zfinal-.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
78+
export _ModuleTable_;
79+
===========================
80+
step 10
81+
lua ProjectDIR/src/lmod.in.lua shell --regression_testing spider a-b
82+
===========================
83+
MODULEPATH=ProjectDIR/rt/regexp/mf/Core;
84+
export MODULEPATH;
85+
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ab={fn="ProjectDIR/rt/regexp/mf/Core/ab/1.0.lua",fullName="ab/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="ab",wV="000000001.*zfinal",},["ab-"]={fn="ProjectDIR/rt/regexp/mf/Core/ab-/2.0-1.lua",fullName="ab-/2.0-1",loadOrder=1,propT={},stackDepth=0,status="active",userName="ab-",wV="000000002.*zfinal-.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/regexp/mf/Core",},systemBaseMPATH="ProjectDIR/rt/regexp/mf/Core",}';
86+
export _ModuleTable_;

‎rt/regexp/regexp.tdesc‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
-- -*- lua -*-
2+
testdescript = {
3+
owner = "rtm",
4+
product = "modules",
5+
description = [[
6+
Test module names with minuses
7+
]],
8+
keywords = {"regexp" },
9+
10+
active = 1,
11+
testName = "regexp",
12+
job_submit_method = "INTERACTIVE",
13+
14+
runScript = [[
15+
16+
. $(projectDir)/rt/common_funcs.sh
17+
unsetMT
18+
initStdEnvVars
19+
export LMOD_TERM_WIDTH=3000
20+
MODULEPATH_ROOT=$(testDir)/mf; export MODULEPATH_ROOT
21+
MODULEPATH=$(testDir)/mf/Core/
22+
export MODULEPATH
23+
24+
remove_generated_lmod_files mf
25+
26+
runLmod --version # 1
27+
runLmod avail # 2
28+
runLmod avail a-b # 3
29+
runLmod avail a-b/1-1 # 4
30+
runLmod avail a # 5
31+
runLmod load ab- # 6
32+
runLmod load ab # 7
33+
runLmod ov # 8
34+
runLmod ov ab- # 9
35+
runLmod spider a-b #10
36+
37+
HOME=$ORIG_HOME
38+
39+
cat _stdout.[0-9][0-9][0-9] > _stdout.orig
40+
joinBase64Results -bash _stdout.orig _stdout.new
41+
cleanUp _stdout.new out.txt
42+
43+
cat _stderr.[0-9][0-9][0-9] > _stderr.orig
44+
cleanUp _stderr.orig err.txt
45+
46+
rm -f results.csv
47+
wrapperDiff --csv results.csv $(testDir)/out.txt out.txt
48+
wrapperDiff --csv results.csv $(testDir)/err.txt err.txt
49+
testFinish -r $(resultFn) -t $(runtimeFn) results.csv
50+
]],
51+
52+
53+
blessScript = [[
54+
# perform what is needed
55+
]],
56+
57+
tests = {
58+
{ id='t1'},
59+
},
60+
61+
}

0 commit comments

Comments
 (0)