diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-05 12:32:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-05 12:32:01 (GMT) |
| commit | 59a8b10b881b33a9d47243c16600be18e697a68c (patch) | |
| tree | 73937c6bcc8773661945b606ca3d648cb8b54808 /test/vds_env.c | |
| parent | 42bd90edc82445a9758937a5149874b79266a733 (diff) | |
| download | hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.zip hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.gz hdf5-59a8b10b881b33a9d47243c16600be18e697a68c.tar.bz2 | |
Merge fixes and code reconciliation wit develop
Diffstat (limited to 'test/vds_env.c')
| -rw-r--r-- | test/vds_env.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/vds_env.c b/test/vds_env.c index 1c2dba9..bd1e3ee 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -22,7 +22,7 @@ const char *FILENAME[] = { "vds_env_virt_0", "vds_env_virt_3", "vds_env_src_2", - "vds_env_%%_src2", + "vds_env%%_src2", NULL }; @@ -130,11 +130,14 @@ test_vds_prefix_second(unsigned config, hid_t fapl) /* Create source file if requested */ if(config & TEST_IO_DIFFERENT_FILE) { - HDgetcwd(buffer, 1024); - HDchdir(TMPDIR); + if(NULL == HDgetcwd(buffer, 1024)) + TEST_ERROR + if(HDchdir(TMPDIR) < 0) + TEST_ERROR if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR - HDchdir(buffer); + if(HDchdir(buffer) < 0) + TEST_ERROR } else { srcfile[0] = vfile; @@ -211,11 +214,14 @@ test_vds_prefix_second(unsigned config, hid_t fapl) /* Reopen srcdset and srcfile if config option specified */ if(config & TEST_IO_CLOSE_SRC) { if(config & TEST_IO_DIFFERENT_FILE) { - HDgetcwd(buffer, 1024); - HDchdir(TMPDIR); + if(NULL == HDgetcwd(buffer, 1024)) + TEST_ERROR + if(HDchdir(TMPDIR) < 0) + TEST_ERROR if((srcfile[0] = H5Fopen(srcfilename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR - HDchdir(buffer); + if(HDchdir(buffer) < 0) + TEST_ERROR } if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset", H5P_DEFAULT)) < 0) TEST_ERROR |