From 593fe4cba70398e852a2ef664c2d656bfbd595d9 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <50467563+victorapm@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:41:40 -0400
Subject: [PATCH] Apply Debian patches (#966)

1. Fix make checkpar
2. Add missing `finalizeAllTimings
3. Add error code support to checktest.sh

---------

Co-authored-by: Drew Parsons <dparsons@debian.org>
---
 src/Makefile                     | 12 +++++++++---
 src/test/checktest.sh            |  8 +++++++-
 src/utilities/_hypre_utilities.h |  1 +
 src/utilities/timing.h           |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 4c9a1dc11..e59569d29 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,6 +8,10 @@ default: all
 # Include all variables defined by configure
 include config/Makefile.config
 
+# Tolerance level for checkpar tests
+# The value of the variable can be set when calling `make checkpar`
+HYPRE_CHECKPAR_TOL ?= 1e-6
+
 # These are the directories for internal blas, lapack and general utilities
 HYPRE_BASIC_DIRS =\
  blas\
@@ -158,6 +162,7 @@ test: all
 check:
 	@ \
 	echo "Checking the library ..."; \
+	set -e; \
 	(cd test; $(MAKE) all); \
 	(cd test; $(CHECKRUN) ./ij $(PARMS) 2> ij.err); \
 	(cd test; $(CHECKRUN) ./struct $(PARMS) 2> struct.err); \
@@ -167,17 +172,18 @@ check:
 checkpar:
 	@ \
         echo "Checking the library ..."; \
+        set -e; \
         (cd test; $(MAKE) all); \
         echo "Testing IJ ..."; \
-        (cd test; ./runtest.sh -tol 1.e-06 -mpi "$(CHECKRUN)" TEST_ij/solvers.sh); \
+        (cd test; ./runtest.sh -atol $(HYPRE_CHECKPAR_TOL) -mpi "$(CHECKRUN)" TEST_ij/solvers.sh); \
         (cd test; ./checktest.sh); \
         (cd test; ./cleantest.sh); \
         echo "Testing Struct ..."; \
-        (cd test; ./runtest.sh -tol 1.e-06 -mpi "$(CHECKRUN)" TEST_struct/solvers.sh); \
+        (cd test; ./runtest.sh -atol $(HYPRE_CHECKPAR_TOL) -mpi "$(CHECKRUN)" TEST_struct/solvers.sh); \
         (cd test; ./checktest.sh); \
         (cd test; ./cleantest.sh); \
         echo "Testing SStruct ..."; \
-        (cd test; ./runtest.sh -tol 1.e-06 -mpi "$(CHECKRUN)" TEST_sstruct/solvers.sh); \
+        (cd test; ./runtest.sh -atol $(HYPRE_CHECKPAR_TOL) -mpi "$(CHECKRUN)" TEST_sstruct/solvers.sh); \
         (cd test; ./checktest.sh); \
         (cd test; ./cleantest.sh); 
 
diff --git a/src/test/checktest.sh b/src/test/checktest.sh
index c2253ab46..9b927b86d 100755
--- a/src/test/checktest.sh
+++ b/src/test/checktest.sh
@@ -19,6 +19,8 @@ cat <<EOF
    script is being run from within the hypre 'test' directory, and all of the
    'TEST_*' directories are checked.
 
+   Returns 0 if all tests pass, 1 if any test fails.
+
    Example usage: $0 TEST_struct TEST_ij
 
 EOF
@@ -36,6 +38,7 @@ else
 fi
 $RESET                     # Restore nullglob setting
 
+error_code=0
 echo ""
 for testdir in $testdirs
 do
@@ -47,7 +50,9 @@ do
          SZ=`ls -l $file | awk '{print $5}'`
          if [ $SZ != 0 ]
          then
-            echo "FAILED : $file  ($SZ)"
+            echo -e "FAILED : $file  ($SZ)\n"
+            cat $file
+            error_code=1
          else
             echo "    OK : $file"
          fi
@@ -55,3 +60,4 @@ do
       echo ""
    fi
 done
+exit $error_code
diff --git a/src/utilities/_hypre_utilities.h b/src/utilities/_hypre_utilities.h
index ea5654950..6216a89fb 100644
--- a/src/utilities/_hypre_utilities.h
+++ b/src/utilities/_hypre_utilities.h
@@ -1289,6 +1289,7 @@ HYPRE_Real time_get_cpu_seconds_( void );
 
 #define hypre_InitializeTiming(name) 0
 #define hypre_FinalizeTiming(index)
+#define hypre_FinalizeAllTimings()
 #define hypre_IncFLOPCount(inc)
 #define hypre_BeginTiming(i)
 #define hypre_EndTiming(i)
diff --git a/src/utilities/timing.h b/src/utilities/timing.h
index aeb049d0a..f09fb1db4 100644
--- a/src/utilities/timing.h
+++ b/src/utilities/timing.h
@@ -40,6 +40,7 @@ HYPRE_Real time_get_cpu_seconds_( void );
 
 #define hypre_InitializeTiming(name) 0
 #define hypre_FinalizeTiming(index)
+#define hypre_FinalizeAllTimings()
 #define hypre_IncFLOPCount(inc)
 #define hypre_BeginTiming(i)
 #define hypre_EndTiming(i)