summaryrefslogtreecommitdiffstats
path: root/test/error_test.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-27 19:02:48 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-27 19:02:48 (GMT)
commit1c61b6fe13f6fd9c84c0407f02865568e0a7f638 (patch)
treee294883e7a2d7de4ec264d9ea68392c3587ecea3 /test/error_test.c
parent82c6eab1814e1e06ef9472f6f4bbc8522064e0bc (diff)
downloadhdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.zip
hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.gz
hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.bz2
[svn-r19481] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19467.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. I created a branch off the trunk called set_auto to continue working on the problem. Tested on jam - backing out, simple.
Diffstat (limited to 'test/error_test.c')
-rw-r--r--test/error_test.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/error_test.c b/test/error_test.c
index 6a37b80..52dcc0c 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -21,7 +21,7 @@
*/
#include "h5test.h"
-#ifdef H5_USE_16_API_DEFAULT
+#ifdef H5_USE_16_API
int main(void)
{
printf("Test skipped because backward compatbility with v1.6 is configured in\n");
@@ -127,8 +127,13 @@ test_error(hid_t file)
TEST_ERROR;
if(old_data != NULL)
TEST_ERROR;
+#ifdef H5_USE_16_API
+ if (old_func != (H5E_auto_t)H5Eprint)
+ TEST_ERROR;
+#else /* H5_USE_16_API */
if (old_func != (H5E_auto2_t)H5Eprint2)
TEST_ERROR;
+#endif /* H5_USE_16_API */
if(H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0)
TEST_ERROR;