Skip to content

Commit

Permalink
Even better testing for downstream conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Mar 28, 2024
1 parent 86e7256 commit 5a6d6f4
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
4 changes: 3 additions & 1 deletion rt/conflict/conflict.tdesc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ testdescript = {
runLmod load F/4.1.4 #34
runLmod load F/3.1.4 #35
runLmod list #36
runLmod unload acme #37
runLmod load D/1.3 #38
runLmod list #39
Expand Down
16 changes: 16 additions & 0 deletions rt/conflict/err.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,19 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing list
===========================
Currently Loaded Modules:
1) acme/1.0 2) D/3.2 3) F/4.1.4
===========================
step 37
lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme
===========================
===========================
step 38
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3
===========================
The following have been reloaded with a version change:
1) D/3.2 => D/1.3
===========================
step 39
lua ProjectDIR/src/lmod.in.lua shell --regression_testing list
===========================
Currently Loaded Modules:
1) F/4.1.4 2) D/1.3
34 changes: 34 additions & 0 deletions rt/conflict/out.txt
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,37 @@ MODULEPATH=ProjectDIR/rt/conflict/mf2/Core;
export MODULEPATH;
_ModuleTable_='_ModuleTable_={MTversion=3,conflictT={acme={{action="between",ie="<3.2",is="1.1>",sType="mt",userName="D",},{action="match",ie=false,is=false,sType="mt",userName="E",},{action="match",ie=false,is=false,sType="mt",userName="F/3.1.4",},},},depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=3,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},acme={fn="ProjectDIR/rt/conflict/mf2/Core/acme/1.0.lua",fullName="acme/1.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="acme",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}';
export _ModuleTable_;
===========================
step 37
lua ProjectDIR/src/lmod.in.lua shell --regression_testing unload acme
===========================
LOADEDMODULES=D/3.2:F/4.1.4;
export LOADEDMODULES;
MODULEPATH=ProjectDIR/rt/conflict/mf2/Core;
export MODULEPATH;
_LMFILES_=ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua:ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua;
export _LMFILES_;
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/3.2.lua",fullName="D/3.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="D/3.2",wV="000000003.000000002.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=2,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}';
export _ModuleTable_;
===========================
step 38
lua ProjectDIR/src/lmod.in.lua shell --regression_testing load D/1.3
===========================
D=1.3;
export D;
LOADEDMODULES=F/4.1.4:D/1.3;
export LOADEDMODULES;
MODULEPATH=ProjectDIR/rt/conflict/mf2/Core;
export MODULEPATH;
_LMFILES_=ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua:ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua;
export _LMFILES_;
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua",fullName="D/1.3",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.3",wV="000000001.000000003.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}';
export _ModuleTable_;
===========================
step 39
lua ProjectDIR/src/lmod.in.lua shell --regression_testing list
===========================
MODULEPATH=ProjectDIR/rt/conflict/mf2/Core;
export MODULEPATH;
_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={D={fn="ProjectDIR/rt/conflict/mf2/Core/D/1.3.lua",fullName="D/1.3",loadOrder=2,propT={},stackDepth=0,status="active",userName="D/1.3",wV="000000001.000000003.*zfinal",},F={fn="ProjectDIR/rt/conflict/mf2/Core/F/4.1.4.lua",fullName="F/4.1.4",loadOrder=1,propT={},stackDepth=0,status="active",userName="F/4.1.4",wV="000000004.000000001.000000004.*zfinal",},},mpathA={"ProjectDIR/rt/conflict/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/conflict/mf2/Core",}';
export _ModuleTable_;

0 comments on commit 5a6d6f4

Please sign in to comment.