diff options
| author | Ray Lu <songyulu@hdfgroup.org> | 2019-04-24 02:22:59 (GMT) |
|---|---|---|
| committer | Ray Lu <songyulu@hdfgroup.org> | 2019-04-24 02:22:59 (GMT) |
| commit | 4fbe80acc27bc0e84eec9880c3c4257802e5bae5 (patch) | |
| tree | 6ff49f1955549d9e1be4dd7e75739a87e42f52c1 /test | |
| parent | 1adec082f2f380b649dfb1c0e6386be2c44adb68 (diff) | |
| parent | 562e8ec915c18f14390558399186aba7e3ead9c1 (diff) | |
| download | hdf5-4fbe80acc27bc0e84eec9880c3c4257802e5bae5.zip hdf5-4fbe80acc27bc0e84eec9880c3c4257802e5bae5.tar.gz hdf5-4fbe80acc27bc0e84eec9880c3c4257802e5bae5.tar.bz2 | |
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'.
Diffstat (limited to 'test')
| -rw-r--r-- | test/external_common.h | 5 | ||||
| -rw-r--r-- | test/external_env.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/external_common.h b/test/external_common.h index 1e4fe7a..cc2b5fb 100644 --- a/test/external_common.h +++ b/test/external_common.h @@ -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. */ diff --git a/test/external_env.c b/test/external_env.c index a62e085..55f68be 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -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; |