reverted unload tests

TACC · Jan 13, 2025 · 7bda4ef · 7bda4ef
1 parent d2ee850
commit 7bda4ef
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 43 deletions.
diff --git a/rt/unload/mf/Compiler/gcc/4.7/mpich2/1.5.2.lua b/rt/unload/mf/Compiler/gcc/4.7/mpich2/1.5.2.lua
diff --git a/rt/unload/mf/Compiler/gcc/4.7/mpich2/1.5.2.lua b/rt/unload/mf/Compiler/gcc/4.7/mpich2/1.5.2.lua
@@ -0,0 +1,17 @@
+-- -*- lua -*-
+local pkgName         = "mpich2"
+local fn              = myFileName():gsub("%.lua$","")
+local fullVersion     = barefilename(fn)
+local pkgVersion      = fullVersion:match("([0-9]+%.[0-9]+)%.?")
+local pkgNameFullV    = pathJoin(pkgName,fullVersion)
+local pkgNameVer      = pathJoin(pkgName,pkgVersion)
+local hierA           = hierarchyA(pkgNameFullV,1)
+local compiler_dir    = hierA[1]
+local pkgRoot         = "/unknown/apps"
+local mdir            = pathJoin(os.getenv('MODULEPATH_ROOT'), "MPI",compiler_dir,pkgNameVer)
+compiler_dir          = compiler_dir:gsub("/","-"):gsub("%.","_")
+local mpihome         = pathJoin(pkgRoot, compiler_dir, pkgNameFullV)
+
+family("MPI")
+prepend_path('MODULEPATH', mdir)
+
diff --git a/rt/unload/mf/Compiler/intel/13.0/mpich2/1.5.2.lua b/rt/unload/mf/Compiler/intel/13.0/mpich2/1.5.2.lua
diff --git a/rt/unload/mf/Compiler/intel/13.0/mpich2/1.5.2.lua b/rt/unload/mf/Compiler/intel/13.0/mpich2/1.5.2.lua
@@ -0,0 +1,17 @@
+-- -*- lua -*-
+local pkgName         = "mpich2"
+local fn              = myFileName():gsub("%.lua$","")
+local fullVersion     = barefilename(fn)
+local pkgVersion      = fullVersion:match("([0-9]+%.[0-9]+)%.?")
+local pkgNameFullV    = pathJoin(pkgName,fullVersion)
+local pkgNameVer      = pathJoin(pkgName,pkgVersion)
+local hierA           = hierarchyA(pkgNameFullV,1)
+local compiler_dir    = hierA[1]
+local pkgRoot         = "/unknown/apps"
+local mdir            = pathJoin(os.getenv('MODULEPATH_ROOT'), "MPI",compiler_dir,pkgNameVer)
+compiler_dir          = compiler_dir:gsub("/","-"):gsub("%.","_")
+local mpihome         = pathJoin(pkgRoot, compiler_dir, pkgNameFullV)
+
+family("MPI")
+prepend_path('MODULEPATH', mdir)
+
diff --git a/rt/unload/mf/Core/B/2.0.lua b/rt/unload/mf/Core/B/2.0.lua
@@ -1,5 +1,5 @@
 setenv("TOTO","set_in_B/2.0")
 if (mode() == "unload") then
-   LmodError("Sucessfully raised mode error in unload of B/2.0")
+   LmodError("Error in unload of B/2.0")
 end
 
diff --git a/rt/unload/mf/Core/C/1.0.lua b/rt/unload/mf/Core/C/1.0.lua
diff --git a/rt/unload/mf/Core/D/1.0.lua b/rt/unload/mf/Core/D/1.0.lua
diff --git a/rt/unload/mf/Core/E/1.0.lua b/rt/unload/mf/Core/E/1.0.lua
diff --git a/rt/unload/mf/Core/F/1.0.lua b/rt/unload/mf/Core/F/1.0.lua
diff --git a/rt/unload/mf/MPI/gcc/4.7/mpich2/1.5/petsc/3.2.lua b/rt/unload/mf/MPI/gcc/4.7/mpich2/1.5/petsc/3.2.lua
diff --git a/rt/unload/mf/MPI/gcc/4.7/mpich2/1.5/petsc/3.2.lua b/rt/unload/mf/MPI/gcc/4.7/mpich2/1.5/petsc/3.2.lua
@@ -0,0 +1 @@
+setenv("PETSC_VERSION","3.2")
diff --git a/rt/unload/mf/MPI/intel/13.0/mpich2/1.5/petsc/3.2.lua b/rt/unload/mf/MPI/intel/13.0/mpich2/1.5/petsc/3.2.lua
diff --git a/rt/unload/mf/MPI/intel/13.0/mpich2/1.5/petsc/3.2.lua b/rt/unload/mf/MPI/intel/13.0/mpich2/1.5/petsc/3.2.lua
@@ -0,0 +1 @@
+setenv("PETSC_VERSION","3.2")
diff --git a/rt/unload/unload.tdesc b/rt/unload/unload.tdesc
@@ -38,15 +38,6 @@ testdescript = {
      runLmod unload intel               # 7
      runLmod load   B                   # 8
      runLmod unload B                   # 9
-     runLmod load   C                   # 10
-     runLmod unload C                   # 11
-     
-     # Test mode-specific load functionality
-     runLmod load   F                   # 12 (Load F first for unload test)
-     runLmod load   D                   # 13 (Should load E, not affect F)
-     runLmod list                       # 14 (Should show D, E, and F loaded)
-     runLmod unload D                   # 15 (Should unload F, keep E)
-     runLmod list                       # 16 (Should show only E loaded)
 
      HOME=$ORIG_HOME