diff options
Diffstat (limited to 'test/h5test.c')
-rw-r--r-- | test/h5test.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/test/h5test.c b/test/h5test.c index a5b50d3..10ca47e 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <sys/stat.h> #include "h5test.h" +#include "H5srcdir.h" #ifdef _WIN32 #include <process.h> @@ -72,7 +73,7 @@ MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */ #endif #define FILENAME_BUF_SIZE 1024 -#define READ_BUF_SIZE 4096 +#define READ_BUF_SIZE 4096 /* * These are the letters that are appended to the file name when generating @@ -872,10 +873,10 @@ h5_get_file_size(const char *filename, hid_t fapl) driver == H5FD_MPIO || driver == H5FD_MPIPOSIX || #endif /* H5_HAVE_PARALLEL */ #ifdef H5_HAVE_WINDOWS - driver == H5FD_WINDOWS || + driver == H5FD_WINDOWS || #endif /* H5_HAVE_WINDOWS */ #ifdef H5_HAVE_DIRECT - driver == H5FD_DIRECT || + driver == H5FD_DIRECT || #endif /* H5_HAVE_DIRECT */ driver == H5FD_LOG) { /* Get the file's statistics */ @@ -1096,9 +1097,9 @@ getenv_all(MPI_Comm comm, int root, const char* name) * * Purpose: Make copy of file. Some tests write to data files under that * are under version control. Those tests should make a copy of - * the versioned file and write to the copy. This function + * the versioned file and write to the copy. This function * prepends srcdir to the name of the file to be copied and uses - * the name of the copy as is. + * the name of the copy as is. * * Return: Success: 0 * @@ -1114,22 +1115,14 @@ getenv_all(MPI_Comm comm, int root, const char* name) hid_t h5_make_local_copy(char *origfilename, char *local_copy_name) { - char filename[FILENAME_BUF_SIZE] = ""; + const char *filename = H5_get_srcdir_filename(origfilename); /* Corrected test file name */ int fd_old = (-1), fd_new = (-1); /* File descriptors for copying data */ ssize_t nread; /* Number of bytes read in */ char buf[READ_BUF_SIZE]; /* Buffer for copying data */ - char * srcdir = HDgetenv("srcdir"); /* The source directory */ - - if(srcdir && ((HDstrlen(srcdir) + - HDstrlen(origfilename) + 6) < FILENAME_BUF_SIZE)) { - HDstrcpy(filename, srcdir); - HDstrcat(filename, "/"); - } - HDstrcat(filename, origfilename); /* Copy old file into temporary file */ if((fd_old = HDopen(filename, O_RDONLY, 0666)) < 0) return -1; - if((fd_new = HDopen(local_copy_name, O_RDWR|O_CREAT|O_TRUNC, 0666)) + if((fd_new = HDopen(local_copy_name, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) return -1; /* Copy data */ @@ -1139,7 +1132,7 @@ h5_make_local_copy(char *origfilename, char *local_copy_name) /* Close files */ if(HDclose(fd_old) < 0) return -1; if(HDclose(fd_new) < 0) return -1; - - return 0; + + return 0; } |