diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2006-05-12 18:29:49 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2006-05-12 18:29:49 (GMT) |
| commit | cbe0bc01f0b36901ae5b7b0abb5ae1f65a9fef02 (patch) | |
| tree | c5a846dc79344aca513399c416b137ab8b1370f4 /test | |
| parent | db31594e6824688b03963fa092761b02d9179296 (diff) | |
| download | hdf5-cbe0bc01f0b36901ae5b7b0abb5ae1f65a9fef02.zip hdf5-cbe0bc01f0b36901ae5b7b0abb5ae1f65a9fef02.tar.gz hdf5-cbe0bc01f0b36901ae5b7b0abb5ae1f65a9fef02.tar.bz2 | |
[svn-r12345] Purpose: Codes for backward compatibility.
Description: Function prototype H5E_walk_t and structure H5E_error_t wasn't backward
compatible.
Solution: Make them compatible with v1.6 and provide new definitions of H5E_walk_stack_t
and H5E_error_stack_t.
Platforms tested: fuss and h5committest.
Diffstat (limited to 'test')
| -rw-r--r-- | test/error_test.c | 6 | ||||
| -rw-r--r-- | test/testerror.sh | 1 | ||||
| -rw-r--r-- | test/testfiles/err_compat_1 | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test/error_test.c b/test/error_test.c index ad3dd11..d19738e 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -76,7 +76,7 @@ hid_t ERR_MIN_GETNUM; #define LONG_DESC_SIZE 8192 -herr_t custom_print_cb(unsigned n, const H5E_error_t *err_desc, void* client_data); +herr_t custom_print_cb(unsigned n, const H5E_error_stack_t *err_desc, void* client_data); /*------------------------------------------------------------------------- @@ -304,7 +304,7 @@ error_stack(void) *------------------------------------------------------------------------- */ static herr_t -long_desc_cb(unsigned UNUSED n, const H5E_error_t *err_desc, void* client_data) +long_desc_cb(unsigned UNUSED n, const H5E_error_stack_t *err_desc, void* client_data) { char *real_desc = (char *)client_data; @@ -430,7 +430,7 @@ dump_error(hid_t estack) *------------------------------------------------------------------------- */ herr_t -custom_print_cb(unsigned n, const H5E_error_t *err_desc, void* client_data) +custom_print_cb(unsigned n, const H5E_error_stack_t *err_desc, void* client_data) { FILE *stream = (FILE *)client_data; char maj[MSG_SIZE]; diff --git a/test/testerror.sh b/test/testerror.sh index 789b86f..fafc05d 100644 --- a/test/testerror.sh +++ b/test/testerror.sh @@ -65,6 +65,7 @@ TEST() { # Extract file name, line number, version and thread IDs because they may be different sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \ -e 's/line [0-9]*/line (number)/' \ + -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \ -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \ $actual_err > $actual_ext cat $actual_ext >> $actual diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1 index dd7578d..032e7bc 100644 --- a/test/testfiles/err_compat_1 +++ b/test/testfiles/err_compat_1 @@ -2,7 +2,7 @@ Expected output for err_compat ############################# Testing error API based on data I/O All error API tests passed. - This program tests the Error API compatible with HDF5 vversion (number) There're supposed to be some error messages + This program tests the Error API compatible with HDF5 version (number). There're supposed to be some error messages ********* Print error stack in HDF5 default way ********* HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in main(): Error test failed |