Merge pull request #1129 from berquist/modules

Update lmod error detection
sstsimulator · Apr 17, 2024 · d62858a · d62858a
2 parents 22795ed + 8f6b679
commit d62858a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildsys/bamboo.sh b/buildsys/bamboo.sh
@@ -772,7 +772,7 @@ linuxSetMPI() {
        *)
            echo "Try loading MPI module as-is: ${desiredMPI}"
            if ModuleEx load "${desiredMPI}"; then
-               return
+               return 0
            fi
            # Not successful, try something else...
            echo "Try loading mpi/${desiredMPI}"

diff --git a/test/utilities/moduleex.sh b/test/utilities/moduleex.sh
@@ -33,7 +33,7 @@ module $@ 1>"$TEMPOUTFILE" 2>"$TEMPERRFILE" || retval=$?
 # Get the retvalue, and scan the temp file for the "ERROR:" (Tcl) or "No
 # module" (Lmod/Lua) signature
 local errcount
-errcount="$(grep -E -c 'ERROR:|No module' $TEMPERRFILE)" || tmp=$?
+errcount="$(grep -E -c 'ERROR:|No module|Lmod has detected the following error' $TEMPERRFILE)" || tmp=$?
 
 # Output what was recorded
 if [[ -s "$TEMPOUTFILE" ]]; then cat "$TEMPOUTFILE"; fi