mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[svn-r21131] Description:
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 FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Mac OS X/32 10.6.8 (amazon) in debug mode
This commit is contained in:
parent
f136245a4f
commit
0a5bcc1df0
19
test/mount.c
19
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;
|
||||
|
Loading…
Reference in New Issue
Block a user