Clean up diff hack for load test

TACC · Oct 9, 2024 · ec592bb · ec592bb
1 parent c7b7ee4
commit ec592bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rt/load/err.txt b/rt/load/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 mclay@tacc.utexas.edu
 ===========================
 step 2

diff --git a/rt/load/load.tdesc b/rt/load/load.tdesc
@@ -121,10 +121,11 @@ testdescript = {
      runLmod load   compiler/intel                          # 68
      runLmod unload compiler/intel                          # 69
      env | sort > end.env.xyzzy
-     diff start.env.xyzzy end.env.xyzzy | $SED \
-          -e 's/^.*_ModuleTable.*//'           \
-          -e 's/^[0-9]\+[ac][0-9]\+.*//'       \
-          -e '/^ *$/d'                         \
+     diff start.env.xyzzy end.env.xyzzy | $SED   \
+          -e 's/^.*_ModuleTable.*//'             \
+          -e 's/^[0-9]\+[ac][0-9]\+.*//'         \
+          -e 's/^[0-9]\+,[0-9]\+[ac][0-9]\+.*//' \
+          -e '/^ *$/d'                           \
           > diff.env.xyzzy
 
      runBase cat diff.env.xyzzy                             # 70

diff --git a/rt/load/out.txt b/rt/load/out.txt
@@ -855,7 +855,6 @@ export _ModuleTable_;
 step 70
 cat diff.env.xyzzy
 ===========================
-49,50c49,50
 < __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/load/mf3:1
 > __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/load/mf4:1
 > __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:1;/bin:1