diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 21:42:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 21:42:50 (GMT) |
| commit | 7beed66358ff6c3d664526bc6e7b9d5990238331 (patch) | |
| tree | f779ab4bea5d3a2b47bd5a4a8e5bfa554796db01 /test/mount.c | |
| parent | cc3bdaa6d905f21d3c9387e811270ce9f03dced0 (diff) | |
| download | hdf5-7beed66358ff6c3d664526bc6e7b9d5990238331.zip hdf5-7beed66358ff6c3d664526bc6e7b9d5990238331.tar.gz hdf5-7beed66358ff6c3d664526bc6e7b9d5990238331.tar.bz2 | |
[svn-r21132] Description:
Bring r21131 from trunk to 1.8 branch:
Disable some test code that isn't going to work correctly again until
we've completely resolved Jira issue #7638.
Tested on:
FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
(h5committested on trunk)
Diffstat (limited to 'test/mount.c')
| -rw-r--r-- | test/mount.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/test/mount.c b/test/mount.c index f63404d..bcd9eb3 100644 --- a/test/mount.c +++ b/test/mount.c @@ -983,10 +983,13 @@ error: static int test_interlink(hid_t fapl) { - hid_t file1 = -1, file2 = -1, type = -1, space = -1, dset = -1; + hid_t file1 = -1, file2 = -1; +#ifdef NOT_NOW + hid_t type = -1, space = -1, dset = -1; + hsize_t cur_dims[1] = {2}; +#endif /* NOT_NOW */ char filename1[1024], filename2[1024]; herr_t status; - hsize_t cur_dims[1] = {2}; TESTING("interfile hard links"); h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1); @@ -1018,6 +1021,11 @@ test_interlink(hid_t fapl) TEST_ERROR } /* end if */ +/* Commented this code out until Jira issue #7638 is resolved. Once that + * issue is resolved (hopefully by refactored the file code to use shared + * file pointers for all operations), this should be uncommented. -QAK + */ +#ifdef NOT_NOW /* Try an interfile hard link by sharing a data type */ if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR if(H5Tcommit2(file1, "/type1", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR @@ -1031,9 +1039,12 @@ test_interlink(hid_t fapl) TEST_ERROR } /* end if */ - /* Shut down */ + /* Close IDs */ if(H5Sclose(space) < 0) FAIL_STACK_ERROR if(H5Tclose(type) < 0) FAIL_STACK_ERROR +#endif /* NOT_NOW */ + + /* Shut down */ if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR if(H5Fclose(file1) < 0) FAIL_STACK_ERROR if(H5Fclose(file2) < 0) FAIL_STACK_ERROR @@ -1043,9 +1054,11 @@ test_interlink(hid_t fapl) error: H5E_BEGIN_TRY { +#ifdef NOT_NOW H5Dclose(dset); H5Sclose(space); H5Tclose(type); +#endif /* NOT_NOW */ H5Fclose(file1); H5Fclose(file2); } H5E_END_TRY; |