diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-09 22:17:52 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-09 22:17:52 (GMT) |
| commit | 0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541 (patch) | |
| tree | 6c6a2d732b70389e350f4f01b3920211e186de36 /test | |
| parent | 7d7842302b1dcf0da0067b30c49da59b8f766cb3 (diff) | |
| download | hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.zip hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.tar.gz hdf5-0dbc51127e4b4bc2f3ada3b0958cc9dc2607c541.tar.bz2 | |
[svn-r22271] unwrap the high level ids in several places
add some workarounds for named datatypes in test cases and H5T routines
fix some iterate bugs with UD links
Diffstat (limited to 'test')
| -rw-r--r-- | test/dtypes.c | 10 | ||||
| -rw-r--r-- | test/mount.c | 1 | ||||
| -rw-r--r-- | test/objcopy.c | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index 23a7bac..88fcc51 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -2987,6 +2987,11 @@ test_compound_16(void) if((int_id = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR if(H5Tcommit2(file, "int", int_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR + /* MSC - workaround datatypes */ + if(H5Tclose(int_id) < 0) goto error; + if((int_id = H5Topen2(file, "int", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + /* Create file compound datatype */ if((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, 2 * sizeof(int) + 2)) < 0) TEST_ERROR if(H5Tinsert(cmpd_f_tid, "i1", (size_t)0, int_id) < 0) TEST_ERROR @@ -3734,6 +3739,11 @@ test_named (hid_t fapl) goto error; } + /* MSC - workaround datatypes */ + if(H5Tclose(type) < 0) goto error; + if((type = H5Topen2(file, "native-int", H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + /* It should be possible to define an attribute for the named type */ if((attr1 = H5Acreate2(type, "attr1", H5T_NATIVE_UCHAR, space, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; diff --git a/test/mount.c b/test/mount.c index 2b6e44f..438cf10 100644 --- a/test/mount.c +++ b/test/mount.c @@ -1504,7 +1504,6 @@ test_mount_after_unmount(hid_t fapl) if(H5Fclose(fid4) < 0) TEST_ERROR - /* Beginning of the actual test code */ /* diff --git a/test/objcopy.c b/test/objcopy.c index 5c20ee8..8c8f411 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -1801,6 +1801,11 @@ test_copy_named_datatype_attr_self(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap /* create named datatype */ if((H5Tcommit2(fid_src, NAME_DATATYPE_SIMPLE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + /* MSC - workaround named datatypes */ + if(H5Tclose(tid) < 0) goto error; + if((tid = H5Topen2(fid_src, NAME_DATATYPE_SIMPLE, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR + /* create dataspace */ if((sid = H5Screate_simple(2, dims, NULL)) < 0) TEST_ERROR |