diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-09-07 17:25:34 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-09-07 17:25:34 (GMT) |
| commit | 052efd9bde06ea2427beffd3ea493cbc53a17608 (patch) | |
| tree | 13cfe453c6ee39c1e80a96e4e474efa9be705f97 /c++/test/h5cpputil.h | |
| parent | e2f7b36b36dc46e3657c0e922752f04d5300b45e (diff) | |
| parent | 478f771243b4e7b7c416dde22b5dcde13e1f3541 (diff) | |
| download | hdf5-052efd9bde06ea2427beffd3ea493cbc53a17608.zip hdf5-052efd9bde06ea2427beffd3ea493cbc53a17608.tar.gz hdf5-052efd9bde06ea2427beffd3ea493cbc53a17608.tar.bz2 | |
Merge pull request #11 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cppapi:develop to develop
Purpose: Code cleanup
Description:
- Used FP_EPSILON in comparing float values to verify read data
- Casted C macro to fix mismatched types in verify_val calls
Platforms tested:
Linux/32 2.6 (jam), Linux/64 (platypus), Darwin (osx1010test)
* commit '478f771243b4e7b7c416dde22b5dcde13e1f3541':
Purpose: Code cleanup Description: - Used FP_EPSILON in comparing float values to verify read data - Casted C macro to fix mismatched types in verify_val calls Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Diffstat (limited to 'c++/test/h5cpputil.h')
| -rw-r--r-- | c++/test/h5cpputil.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index b615194..50cde99 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -89,7 +89,7 @@ template <class Type1, class Type2> { cerr << endl; cerr << "*** UNEXPECTED VALUE: " << file_name << ":line " << line - << ":" << msg << " different: " << x << ", should be " << value + << ": " << msg << " different: " << x << ", should be " << value << endl; IncTestNumErrs(); throw TestFailedException(file_name, msg); @@ -127,6 +127,19 @@ template <class Type1, class Type2> } } +template <class Type1, class Type2> + void verify_val(Type1 x, Type2 value, float epsilon, const char* msg, int line, const char* file_name) +{ + if (x == value) + { + cerr << endl; + cerr << "*** UNEXPECTED FLOAT VALUE: " << file_name << ":line " << line + << ": " << msg << " different: " << x << ", should be " << value + << " (epsilon=" << epsilon << ")" << endl; + IncTestNumErrs(); + throw TestFailedException(file_name, msg); + } +} /* Prototypes for the test routines */ #ifdef __cplusplus |