Merge pull request #1672 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10658-performance-drop-between-1.8-fix4 to develop

* commit '562e8ec915c18f14390558399186aba7e3ead9c1':
  Changing file names and directory names to avoid possible conflict during parallel 'make check'.
This commit is contained in:
Ray Lu 2019-04-23 21:22:59 -05:00
commit 4fbe80acc2
2 changed files with 8 additions and 3 deletions

View File

@ -33,6 +33,11 @@ static const char *EXT_FNAME[] = {
NULL
};
static const char *EXT_ENV_FNAME[] = {
"extern_env_dir/env_file_1",
NULL
};
/* A similar collection of files is used for the tests that
* perform file I/O.
*/

View File

@ -56,10 +56,10 @@ test_path_env(hid_t fapl)
TESTING("prefix in HDF5_EXTFILE_PREFIX");
if(HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
if(HDmkdir("extern_env_dir", (mode_t)0755) < 0 && errno != EEXIST)
TEST_ERROR;
h5_fixname(EXT_FNAME[4], fapl, filename, sizeof(filename));
h5_fixname(EXT_ENV_FNAME[0], fapl, filename, sizeof(filename));
if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
FAIL_STACK_ERROR
@ -194,7 +194,7 @@ main(void)
HDremove("extern_env_3w.raw");
HDremove("extern_env_4w.raw");
HDrmdir("extern_dir");
HDrmdir("extern_env_dir");
} /* end if */
return EXIT_SUCCESS;