[svn-r22600] Description:

    Bring r22251:22599 from trunk to revise_chunks branch.

Tested on:
    Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.1, C++ & FORTRAN
    (Not h5committested yet, as this branch doesn't require it)

1 files changed, 24 insertions, 24 deletions

diff --git a/test/file_image.c b/test/file_image.c
index 7c2c3ff..73c901e 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -108,7 +108,7 @@ test_properties(void)
     buffer = (char *)HDmalloc(size);
     for(i = 0; i < count - 1; i++)
         buffer[i] = (char)(65 + i);
-    buffer[count] = '\0';
+    buffer[count - 1] = '\0';
 
     /* Create fapl */
     if((fapl_1 = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR
@@ -324,7 +324,7 @@ static int
 test_callbacks(void)
 {
     H5FD_file_image_callbacks_t real_callbacks = {&malloc_cb, &memcpy_cb, &realloc_cb, 
-	&free_cb, &udata_copy_cb, &udata_free_cb, NULL};
+    &free_cb, &udata_copy_cb, &udata_free_cb, NULL};
     H5FD_file_image_callbacks_t null_callbacks = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
     H5FD_file_image_callbacks_t callbacks;
     hid_t fapl_1;
@@ -351,7 +351,7 @@ test_callbacks(void)
     file_image = (char *)HDmalloc(size);
     for(i = 0; i < count - 1; i++)
         file_image[i] = (char)(65 + i);
-    file_image[count] = '\0';
+    file_image[count - 1] = '\0';
 
     /* Create fapl */
     if((fapl_1 = H5Pcreate(H5P_FILE_ACCESS)) < 0) FAIL_STACK_ERROR
@@ -519,7 +519,7 @@ test_core(void)
     udata_t *udata;
     unsigned char *file_image;
     char    filename[1024];
-    char    src_dir_filename[1024];
+    char    copied_filename[1024];
     const char *tmp = NULL;
     size_t  size;
     hsize_t dims[2];
@@ -527,7 +527,7 @@ test_core(void)
     h5_stat_t  sb;
     herr_t ret;
     H5FD_file_image_callbacks_t callbacks = {&malloc_cb, &memcpy_cb, &realloc_cb, 
-	&free_cb, &udata_copy_cb, &udata_free_cb, NULL};
+    &free_cb, &udata_copy_cb, &udata_free_cb, NULL};
 
     TESTING("Initial file image and callbacks in Core VFD");
     
@@ -542,16 +542,15 @@ test_core(void)
     tmp = h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
     VERIFY(tmp != NULL, "h5_fixname failed");
 
-    /* convert file name to srcdir file name.  Make a copy as 
-     * H5_get_srcdir_filename() simply sets up the file name in its
-     * own buffer each time it is called -- overwriting the previous
-     * value.
-     */
-    tmp = H5_get_srcdir_filename(filename);
-    VERIFY(tmp != NULL, "H5_get_srcdir_filename failed");
-    VERIFY(strlen(tmp) < 1023, "srcdir file name too long.");
-    HDstrncpy(src_dir_filename, tmp, 1023);
-    src_dir_filename[1023] = '\0';
+    /* Append ".copy" to the filename from the source directory */
+    VERIFY(HDstrlen(filename) < (1023 - 5), "file name too long.");
+    HDstrncpy(copied_filename, filename, 1023);
+    copied_filename[1023] = '\0';
+    HDstrcat(copied_filename, ".copy");
+
+    /* Make a copy of the data file from svn. */
+    ret = h5_make_local_copy(filename, copied_filename);
+    VERIFY(ret >= 0, "h5_make_local_copy");
 
     /* Allocate and initialize udata */
     udata = (udata_t *)HDmalloc(sizeof(udata_t));
@@ -566,7 +565,7 @@ test_core(void)
 
     /* Test open (no file image) */
     reset_udata(udata);
-    file = H5Fopen(src_dir_filename, H5F_ACC_RDWR, fapl);
+    file = H5Fopen(copied_filename, H5F_ACC_RDONLY, fapl);
     VERIFY(file >= 0, "H5Fopen failed");
     VERIFY(udata->used_callbacks == MALLOC, "opening a core file used the wrong callbacks");
     VERIFY(udata->malloc_src == H5FD_FILE_IMAGE_OP_FILE_OPEN, "Malloc callback came from wrong sourc in core open");
@@ -579,7 +578,7 @@ test_core(void)
     VERIFY(udata->free_src == H5FD_FILE_IMAGE_OP_FILE_CLOSE, "Free callback came from wrong sourc in core close");
 
     /* Reopen file */
-    file = H5Fopen(src_dir_filename, H5F_ACC_RDWR, fapl);
+    file = H5Fopen(copied_filename, H5F_ACC_RDWR, fapl);
     VERIFY(file >= 0, "H5Fopen failed");
 
     /* Set up a new dset */
@@ -613,7 +612,7 @@ test_core(void)
     VERIFY(udata->free_src == H5FD_FILE_IMAGE_OP_FILE_CLOSE, "Free callback came from wrong sourc in core close");
 
     /* Create file image buffer */
-    fd = HDopen(src_dir_filename, O_RDONLY, 0666);
+    fd = HDopen(copied_filename, O_RDONLY, 0666);
     VERIFY(fd > 0, "open failed");
     ret = HDfstat(fd, &sb);
     VERIFY(ret == 0, "fstat failed");
@@ -627,13 +626,14 @@ test_core(void)
     if(H5Pset_file_image(fapl, file_image, size) < 0) FAIL_STACK_ERROR
 
     /* Test open with file image */
-    if((file = H5Fopen("dne.h5", H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR
+    if((file = H5Fopen("dne.h5", H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR
     if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Release resources */
     h5_cleanup(FILENAME, fapl); 
     HDfree(udata);
     HDfree(file_image);
+    HDremove(copied_filename);
     
     PASSED();
 
@@ -786,10 +786,10 @@ test_get_file_image(const char * test_banner,
             VERIFY(fd >= 0, "HDopen() failed.");
 
             if(size_remaining >= FAMILY_SIZE ){
-	        bytes_to_read = FAMILY_SIZE;
+            bytes_to_read = FAMILY_SIZE;
                 size_remaining -= FAMILY_SIZE;
             } else {
-	        bytes_to_read = size_remaining;
+            bytes_to_read = size_remaining;
                 size_remaining = 0;
             }
 
@@ -816,7 +816,7 @@ test_get_file_image(const char * test_banner,
          */
         file_size = (ssize_t)stat_buf.st_size;
 
-	/* with latest mods to truncate call in core file drive, 
+    /* with latest mods to truncate call in core file drive, 
          * file size should match image size 
          */
         VERIFY(file_size == image_size, "file size != image size.");
@@ -940,9 +940,9 @@ test_get_file_image_error_rejection(void)
      * Since we have already done the necessary setup, verify that 
      * H5Fget_file_image() will fail with:
      *
-     *		bad file id, or
+     *        bad file id, or
      *
-     *		good id, but not a file id
+     *        good id, but not a file id
      */