aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a>2011-12-21 23:31:23 +0000
committereschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a>2011-12-21 23:31:23 +0000
commit0ef2cb5241112d1ddf2078cea47edf5272d0f846 (patch)
tree9e988f41fd5d3c612ee8f78394eed15a81314417
parentebc3d7822bc7cba529f13239f3dbf4c30bf58a4c (diff)
Output more information in test case failure error messages
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@43 105869f7-3296-0410-a4ea-f4349344b45a
-rw-r--r--src/test.cc49
1 files changed, 27 insertions, 22 deletions
diff --git a/src/test.cc b/src/test.cc
index e5ae613..5118497 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -13,33 +13,38 @@ inline int my_signbit (CCTK_REAL const x)
}
#define SCALARTEST(testname, vecexpr, scalarexpr) \
-do { \
- if (verbose) \
- CCTK_VInfo (CCTK_THORNSTRING, "Test %s...", testname); \
- CCTK_REAL res = (scalarexpr); \
- CCTK_REAL vecres = (vecexpr); \
- if(vecres == res) \
- passed++; \
- else \
- CCTK_VParamWarn(CCTK_THORNSTRING, "Failed test %s", (testname)); \
- numtests++; \
-} while(0)
-
-#define VECTEST(testname, vecexpr, scalarexpr) \
-do { \
- if (verbose) \
- CCTK_VInfo (CCTK_THORNSTRING, "Test %s...", testname); \
- CCTK_REAL_VEC rv = (vecexpr); \
- for(int i=0; i<CCTK_REAL_VEC_SIZE; i++) { \
+ do { \
+ if (verbose) \
+ CCTK_VInfo (CCTK_THORNSTRING, "Test %s...", testname); \
CCTK_REAL res = (scalarexpr); \
- CCTK_REAL vecres = vec_elt(rv,i); \
+ CCTK_REAL vecres = (vecexpr); \
if(vecres == res) \
passed++; \
else \
- CCTK_VParamWarn(CCTK_THORNSTRING, "Failed test %s", (testname)); \
+ CCTK_VParamWarn(CCTK_THORNSTRING, \
+ "Failed test %s: expected %.17g, received %.17g", \
+ testname, (double)res, (double)vecres); \
numtests++; \
- } \
-} while(0)
+ } while(0)
+
+#define VECTEST(testname, vecexpr, scalarexpr) \
+ do { \
+ if (verbose) \
+ CCTK_VInfo (CCTK_THORNSTRING, "Test %s...", testname); \
+ CCTK_REAL_VEC rv = (vecexpr); \
+ for(int i=0; i<CCTK_REAL_VEC_SIZE; i++) { \
+ CCTK_REAL res = (scalarexpr); \
+ CCTK_REAL vecres = vec_elt(rv,i); \
+ if(vecres == res) \
+ passed++; \
+ else \
+ CCTK_VParamWarn(CCTK_THORNSTRING, \
+ "Failed test %s: " \
+ "for element %d, expected %.17g, received %.17g", \
+ testname, i, (double)res, (double)vecres); \
+ numtests++; \
+ } \
+ } while(0)
extern "C"
void Vectors_Test(CCTK_ARGUMENTS)