summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-07-12 21:49:13 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2017-07-12 21:49:13 (GMT)
commit2fd104e07db835d1f723fce28b1050d9e6b17b14 (patch)
tree0617813bf955f6737e5349c2beece96bd2f9050d
parente47ff92e92ae4ae4123e4083d619630f8bf3f004 (diff)
parent966fbddc9a42b19c47551cab46a462f1b7d40ffa (diff)
downloadhdf5-2fd104e07db835d1f723fce28b1050d9e6b17b14.zip
hdf5-2fd104e07db835d1f723fce28b1050d9e6b17b14.tar.gz
hdf5-2fd104e07db835d1f723fce28b1050d9e6b17b14.tar.bz2
Merge pull request #600 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit '966fbddc9a42b19c47551cab46a462f1b7d40ffa': Revert change for temporary testing.
-rw-r--r--test/objcopy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/objcopy.c b/test/objcopy.c
index d792462..e679007 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -6664,8 +6664,7 @@ test_copy_old_layout(hid_t fcpl_dst, hid_t fapl, hbool_t test_open)
addr_reset();
/* open source file (read-only) */
- //if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
- if((fid_src = H5Fopen("../../hdf5/test/fill_old.h5", H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
+ if((fid_src = H5Fopen(src_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
/* create destination file */
if((fid_dst = H5Fcreate(dst_filename, H5F_ACC_TRUNC, fcpl_dst, fapl)) < 0) TEST_ERROR