diff options
author | Ray Lu <songyulu@hdfgroup.org> | 2019-08-14 20:56:26 (GMT) |
---|---|---|
committer | Ray Lu <songyulu@hdfgroup.org> | 2019-08-14 20:56:26 (GMT) |
commit | a62dc4271dd62eb7a211cbe84e2c0916c87af25a (patch) | |
tree | 110695cd0ff601a41fb29ae19478166748b05e25 | |
parent | 3b003bf3515b5eccf2995811f88a82aaf7639e64 (diff) | |
parent | 8682040032371fd720eac5464eaa9b2638e166d9 (diff) | |
download | hdf5-a62dc4271dd62eb7a211cbe84e2c0916c87af25a.zip hdf5-a62dc4271dd62eb7a211cbe84e2c0916c87af25a.tar.gz hdf5-a62dc4271dd62eb7a211cbe84e2c0916c87af25a.tar.bz2 |
Merge pull request #1870 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/directory_name to hdf5_1_10
* commit '8682040032371fd720eac5464eaa9b2638e166d9':
Changed a directory name left out from the previous commit.
Changed the name of the temporary directory from 'tmp' to a special name to avoid possible conflicts.
-rw-r--r-- | test/links.c | 4 | ||||
-rw-r--r-- | test/links_env.c | 2 | ||||
-rw-r--r-- | test/vds.c | 2 | ||||
-rw-r--r-- | test/vds_env.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/test/links.c b/test/links.c index f5b1716..3a347ea 100644 --- a/test/links.c +++ b/test/links.c @@ -39,8 +39,8 @@ /* File for external link test. Created with gen_udlinks.c */ #define LINKED_FILE "be_extlink2.h5" -#define TMPDIR "tmp/" -#define TMPDIR2 "tmp2/" +#define TMPDIR "tmp_links/" +#define TMPDIR2 "tmp2_links/" /* Symlinks for external link symlink test */ #define SYMLINK1 TMPDIR "sym1.h5" diff --git a/test/links_env.c b/test/links_env.c index b32fb32..daa00cd 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -23,7 +23,7 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ -#define TMPDIR "tmp/" +#define TMPDIR "tmp_links_env/" #define NAME_BUF_SIZE 1024 const char *FILENAME[] = { @@ -55,7 +55,7 @@ const char *FILENAME[] = { #define FILENAME_BUF_SIZE 1024 -#define TMPDIR "tmp/" +#define TMPDIR "tmp_vds/" /*------------------------------------------------------------------------- diff --git a/test/vds_env.c b/test/vds_env.c index bd1e3ee..fc6652b 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -34,7 +34,7 @@ const char *FILENAME[] = { #define FILENAME_BUF_SIZE 1024 -#define TMPDIR "tmp/" +#define TMPDIR "tmp_vds_env/" /*------------------------------------------------------------------------- * Function: test_vds_prefix_second |