From 27622c04c39698c866b8f80b73a7f5c2ff2805a4 Mon Sep 17 00:00:00 2001 From: Matthew Masarik Date: Fri, 20 Dec 2024 21:20:13 +0000 Subject: [PATCH] run_cmake_test: switch manipulation to enforce SHRD build --- regtests/bin/run_cmake_test | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test index 07ade5a8b..6e3711996 100755 --- a/regtests/bin/run_cmake_test +++ b/regtests/bin/run_cmake_test @@ -424,13 +424,13 @@ then sed 's/OMPG //' | sed 's/NOGRB/NCEP2/' | \ sed 's/OMPH //' | sed 's/PDLIB //' | \ sed 's/B4B //' | sed 's/METIS //' | \ - sed 's/SCOTCH //' > $path_build/switch + sed 's/SCOTCH //' | sed 's/SCRIPMPI //' > $path_build/switch else cat $file_c | sed 's/DIST/SHRD/' | sed 's/MPI //' | \ sed 's/OMPG //' | \ sed 's/OMPH //' | sed 's/PDLIB //' | \ sed 's/B4B //' | sed 's/METIS //' | \ - sed 's/SCOTCH //' > $path_build/switch + sed 's/SCOTCH //' | sed 's/SCRIPMPI //' > $path_build/switch fi echo "Switch file is $path_build/switch with switches:" >> $ofile @@ -444,14 +444,14 @@ then fi make -j 8 VERBOSE=1 >> $ofile 2>&1 rc=$? - if (( rc != 0 )); then + if (( rc != 0 )); then echo "Fatal error in make." echo "The build log is in ${ofile}" exit ${rc} fi make install >> $ofile 2>&1 rc=$? - if (( rc != 0 )); then + if (( rc != 0 )); then echo "Fatal error in make install." echo "The build log is in $ofile" exit ${rc} @@ -519,14 +519,14 @@ else fi make -j 8 VERBOSE=1 >> $ofile 2>&1 rc=$? - if (( rc != 0 )); then + if (( rc != 0 )); then echo "Fatal error in make." echo "The build log is in ${ofile}" exit ${rc} fi make install >> $ofile 2>&1 rc=$? - if (( rc != 0 )); then + if (( rc != 0 )); then echo "Fatal error in make." echo "The build log is in ${ofile}" exit ${rc}