[svn-r29182] Re-commit of HDFFV-8740 fix, which adds the ability to configure

external dataset storage path behavior.

This check-in fixes a bug in the original check-in where the
external path stored in the file struct was not copied on reopen
causing subsequent dataset operations to fail.

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           autotools serial w/ fortran and C++
           autotools parallel (MPICH 3.1.4) w/ fortran

3 files changed, 791 insertions, 174 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 8389cc4..c3761b7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -129,7 +129,7 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse
     huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_expand.h5 \
     copy_dcpl_newfile.h5 extend.h5 istore.h5 extlinks*.h5 frspace.h5 links*.h5 \
     sys_file1 tfile[1-7].h5 th5s[1-4].h5 lheap.h5 fheap.h5 ohdr.h5 \
-    stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
+    stab.h5 extern_[1-4].h5 extern_[1-4][rw].raw gheap[0-4].h5 \
     dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
     big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
     stdio.h5 sec2.h5 dtypes[0-9].h5 dtypes1[0].h5 dt_arith[1-2].h5 tattr.h5 \
diff --git a/test/external.c b/test/external.c
index 181f43b..af38428 100644
--- a/test/external.c
+++ b/test/external.c
@@ -17,7 +17,7 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Tuesday, March  3, 1998
  *
- * Purpose:     Tests datasets stored in external raw files.
+ * Purpose:	Tests datasets stored in external raw files.
  */
 #include "h5test.h"
 
@@ -25,9 +25,19 @@ const char *FILENAME[] = {
     "extern_1",
     "extern_2",
     "extern_3",
+    "extern_4",
+    "extern_dir/file_1",
     NULL
 };
 
+/* A similar collection of files is used for the tests that
+ * perform file I/O.
+ */
+#define N_EXT_FILES         4
+#define PART_SIZE           25
+#define TOTAL_SIZE          100
+#define GARBAGE_PER_FILE    10
+
 
 /*-------------------------------------------------------------------------
  * Function:    files_have_same_contents
@@ -35,7 +45,7 @@ const char *FILENAME[] = {
  * Purpose:     Determines whether two files contain the same data.
  *
  * Return:      Success:    nonzero if same, zero if different.
- *              Failure:    zero
+ *		        Failure:    zero
  *
  * Programmer:  Robb Matzke
  *              Wednesday, March  4, 1998
@@ -45,9 +55,9 @@ const char *FILENAME[] = {
 static hbool_t
 files_have_same_contents(const char *name1, const char *name2)
 {
-    int     fd1 = 0, fd2 = 0;
-    ssize_t n1, n2;
-    char    buf1[1024], buf2[1024];
+    int		fd1 = 0, fd2 = 0;
+    ssize_t	n1, n2;
+    char	buf1[1024], buf2[1024];
     hbool_t ret = false;            /* not equal until proven otherwise */
 
     if((fd1 = HDopen(name1, O_RDONLY, 0666)) < 0)
@@ -90,6 +100,106 @@ out:
 
 
 /*-------------------------------------------------------------------------
+ * Function:    reset_raw_data_files
+ *
+ * Purpose:     Resets the data in the raw data files for tests that
+ *              perform dataset I/O on a set of files.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ * Programmer:  Dana Robinson
+ *              February 2016
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+reset_raw_data_files(void)
+{
+    int		    fd = 0;             /* external file descriptor             */
+    size_t	    i, j;               /* iterators                            */
+    hssize_t	n;                  /* bytes of I/O                         */
+    char	    filename[1024];     /* file name                            */
+    int		    data[PART_SIZE];    /* raw data buffer                      */
+    uint8_t     *garbage = NULL;    /* buffer of garbage data               */
+    size_t      garbage_count;      /* size of garbage buffer               */
+    size_t      garbage_bytes;      /* # of garbage bytes written to file   */
+
+    /* Set up garbage buffer */
+    garbage_count = N_EXT_FILES * GARBAGE_PER_FILE;
+    if(NULL == (garbage = (uint8_t *)HDcalloc(garbage_count, sizeof(uint8_t))))
+        goto error;
+    for(i = 0; i < garbage_count; i++)
+        garbage[i] = 0xFF;
+
+    /* The *r files are pre-filled with data and are used to
+     * verify that read operations work correctly.
+     */
+    for(i = 0; i < N_EXT_FILES; i++) {
+
+        /* Open file */
+        HDsprintf(filename, "extern_%lur.raw", (unsigned long)i + 1);
+        if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
+            goto error;
+        
+        /* Write garbage data to the file. This allows us to test the
+         * the ability to set an offset in the raw data file.
+         */
+        garbage_bytes = i * 10;
+        n = HDwrite(fd, garbage, garbage_bytes);
+        if(n < 0 || (size_t)n != garbage_bytes)
+            goto error;
+
+        /* Fill array with data */
+        for(j = 0; j < PART_SIZE; j++) {
+            data[j] = (int)(i * 25 + j);
+        } /* end for */
+
+        /* Write raw data to the file. */
+        n = HDwrite(fd, data, sizeof(data));
+        if(n != sizeof(data))
+            goto error;
+
+        /* Close this file */
+        HDclose(fd);
+
+    } /* end for */
+
+    /* The *w files are only pre-filled with the garbage data and are
+     * used to verify that write operations work correctly. The individual
+     * tests fill in the actual data.
+     */
+    for(i = 0; i < N_EXT_FILES; i++) {
+
+        /* Open file */
+        HDsprintf(filename, "extern_%luw.raw", (unsigned long)i + 1);
+        if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
+            goto error;
+        
+        /* Write garbage data to the file. This allows us to test the
+         * the ability to set an offset in the raw data file.
+         */
+        garbage_bytes = i * 10;
+        n = HDwrite(fd, garbage, garbage_bytes);
+        if(n < 0 || (size_t)n != garbage_bytes)
+            goto error;
+
+        /* Close this file */
+        HDclose(fd);
+
+    } /* end for */
+    HDfree(garbage);
+    return SUCCEED;
+
+error:
+    if(fd)
+        HDclose(fd);
+    if(garbage)
+        HDfree(garbage);
+    return FAIL;
+} /* end reset_raw_data_files() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    test_non_extendible
  *
  * Purpose:     Tests a non-extendible dataset with a single external file.
@@ -105,15 +215,15 @@ out:
 static int
 test_non_extendible(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* data space current size              */
-    hsize_t max_size[1];        /* data space maximum size              */
-    int     n;                  /* number of external files             */
-    char    name[256];          /* external file name                   */
-    off_t   file_offset;        /* external file offset                 */
-    hsize_t file_size;          /* sizeof external file segment         */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* data space current size              */
+    hsize_t	max_size[1];        /* data space maximum size              */
+    int		n;                  /* number of external files             */
+    char	name[256];          /* external file name                   */
+    off_t	file_offset;        /* external file offset                 */
+    hsize_t	file_size;          /* sizeof external file segment         */
     haddr_t dset_addr;          /* address of dataset                   */
 
     TESTING("fixed-size data space, exact storage");
@@ -203,7 +313,7 @@ test_non_extendible(hid_t file)
  * Return:      Success:    0
  *              Failure:    1
  *
- * Programmer:  Robb Matzke
+ * Programmer:	Robb Matzke
  *              Monday, November 23, 1998
  *
  *-------------------------------------------------------------------------
@@ -211,11 +321,11 @@ test_non_extendible(hid_t file)
 static int
 test_too_small(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* current data space size              */
-    hsize_t max_size[1];        /* maximum data space size              */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* current data space size              */
+    hsize_t	max_size[1];        /* maximum data space size              */
 
     TESTING("external storage is too small");
 
@@ -257,10 +367,10 @@ test_too_small(hid_t file)
  *              represent the current data and large enough to represent the
  *              eventual size of the data.
  *
- * Return:      Success:    0
- *              Failure:    1
+ * Return:  Success:    0
+ *          Failure:    1
  *
- * Programmer:  Robb Matzke
+ * Programmer:	Robb Matzke
  *              Monday, November 23, 1998
  *
  *-------------------------------------------------------------------------
@@ -268,11 +378,11 @@ test_too_small(hid_t file)
 static int
 test_large_enough_current_eventual(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* current data space size              */
-    hsize_t max_size[1];        /* maximum data space size              */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* current data space size              */
+    hsize_t	max_size[1];        /* maximum data space size              */
 
     TESTING("extendible dataspace, exact external size");
 
@@ -321,11 +431,11 @@ error:
 static int
 test_large_enough_current_not_eventual(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* current data space size              */
-    hsize_t max_size[1];        /* maximum data space size              */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* current data space size              */
+    hsize_t	max_size[1];        /* maximum data space size              */
 
     TESTING("extendible dataspace, external storage is too small");
 
@@ -361,7 +471,7 @@ test_large_enough_current_not_eventual(hid_t file)
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_1e
+ * Function:    test_unlimited
  *
  * Purpose:     Test a single external file of unlimited size and an
  *              unlimited data space.
@@ -377,15 +487,15 @@ test_large_enough_current_not_eventual(hid_t file)
 static int
 test_unlimited(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* data space current size              */
-    hsize_t max_size[1];        /* data space maximum size              */
-    int     n;                  /* number of external files             */
-    char    name[256];          /* external file name                   */
-    off_t   file_offset;        /* external file offset                 */
-    hsize_t file_size;          /* sizeof external file segment         */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* data space current size              */
+    hsize_t	max_size[1];        /* data space maximum size              */
+    int		n;                  /* number of external files             */
+    char	name[256];          /* external file name                   */
+    off_t	file_offset;        /* external file offset                 */
+    hsize_t	file_size;          /* sizeof external file segment         */
 
     TESTING("unlimited dataspace, unlimited external storage");
 
@@ -468,11 +578,11 @@ test_unlimited(hid_t file)
 static int
 test_multiple_files(hid_t file)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* dataspace                            */
-    hid_t   dset = -1;          /* dataset                              */
-    hsize_t cur_size[1];        /* data space current size              */
-    hsize_t max_size[1];        /* data space maximum size              */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* dataspace                            */
+    hid_t	dset = -1;          /* dataset                              */
+    hsize_t	cur_size[1];        /* data space current size              */
+    hsize_t	max_size[1];        /* data space maximum size              */
 
     TESTING("multiple external files");
 
@@ -528,9 +638,9 @@ error:
 static int
 test_add_to_unlimited(void)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    herr_t  status;             /* function return status               */
-    int     n;                  /* number of external files             */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    herr_t	status;             /* function return status               */
+    int		n;                  /* number of external files             */
 
     TESTING("external file following unlimited file");
 
@@ -579,8 +689,8 @@ test_add_to_unlimited(void)
 static int
 test_overflow(void)
 {
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    herr_t  status;             /* return status                        */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    herr_t	status;             /* return status                        */
 
     TESTING("address overflow in external files");
 
@@ -624,43 +734,30 @@ test_overflow(void)
 static int
 test_read_file_set(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to write to                     */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hid_t   grp = -1;           /* group to emit diagnostics            */
-    int     fd = -1;            /* external file descriptors            */
-    size_t  i, j;               /* miscellaneous counters               */
-    hssize_t    n;              /* bytes of I/O                         */
-    char    filename[1024];     /* file names                           */
-    int     part[25], whole[100];   /* raw data buffers                 */
-    hsize_t cur_size;           /* current data space size              */
-    hid_t   hs_space;           /* hyperslab data space                 */
-    hsize_t hs_start = 30;      /* hyperslab starting offset            */
-    hsize_t hs_count = 25;      /* hyperslab size                       */
-    int temparray[10] = {0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f};
+    hid_t	file = -1;          /* file to write to                     */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    hid_t	grp = -1;           /* group to emit diagnostics            */
+    size_t	i;                  /* miscellaneous counter                */
+    char	filename[1024];     /* file names                           */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size;           /* current data space size              */
+    hid_t	hs_space = -1;      /* hyperslab data space                 */
+    hsize_t	hs_start = 30;      /* hyperslab starting offset            */
+    hsize_t	hs_count = 25;      /* hyperslab size                       */
 
     TESTING("read external dataset");
 
-    /* Write the data to external files directly */
-    for(i=0; i<4; i++) {
-        for(j=0; j<25; j++) {
-            part[j] = (int)(i*25+j);
-        } /* end for */
-        HDsprintf(filename, "extern_%lua.raw", (unsigned long)i+1);
-        if((fd = HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
-            TEST_ERROR
-        n = HDwrite(fd, temparray, (size_t)i*10);
-        if(n < 0 || (size_t)n != i*10)
-            TEST_ERROR
-        n = HDwrite(fd, part, sizeof(part));
-        if(n != sizeof(part))
+    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+        TEST_ERROR
+
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
         TEST_ERROR
-        HDclose(fd);
-    } /* end for */
 
-    /*
-     * Create the file and an initial group.  This causes messages about
+    /* Create the file and an initial group.  This causes messages about
      * debugging to be emitted before we start playing games with what the
      * output looks like.
      */
@@ -671,50 +768,57 @@ test_read_file_set(hid_t fapl)
         FAIL_STACK_ERROR
     if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
 
-    /* Create the dataset */
+    /* Create the dcpl */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "extern_1a.raw",  (off_t)0, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_2a.raw", (off_t)10, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_3a.raw", (off_t)20, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_4a.raw", (off_t)30, (hsize_t)sizeof part) < 0)
-        FAIL_STACK_ERROR
-    cur_size = 100;
+    for(i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "extern_%dr.raw", (int) i + 1);
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* Create the dataspace */
+    cur_size = TOTAL_SIZE;
     if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
         FAIL_STACK_ERROR
+
+    /* Create the dataset */
     if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
-    /*
-     * Read the entire dataset and compare with the original
-     */
+    /* Read the entire dataset */
     HDmemset(whole, 0, sizeof(whole));
     if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < 100; i++)
+
+    /* Compare data */
+    for(i = 0; i < TOTAL_SIZE; i++)
         if(whole[i] != (signed)i)
-            FAIL_PUTS_ERROR("    Incorrect value(s) read.");
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
-        /* Read the middle of the dataset */
-        if((hs_space = H5Scopy(space)) < 0)
-            FAIL_STACK_ERROR
-        if(H5Sselect_hyperslab(hs_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
-            FAIL_STACK_ERROR
+    /* Read via a hypserslab in the middle of the dataset */
 
-        HDmemset(whole, 0, sizeof(whole));
-        if(H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0)
-            FAIL_STACK_ERROR
+    /* Set up dataspace */
+    if((hs_space = H5Scopy(space)) < 0)
+        FAIL_STACK_ERROR
+    if(H5Sselect_hyperslab(hs_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
+        FAIL_STACK_ERROR
 
-        if(H5Sclose(hs_space) < 0) FAIL_STACK_ERROR
+    /* Read */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
 
-        for(i = hs_start; i<hs_start+hs_count; i++) {
-            if(whole[i] != (signed)i)
-                FAIL_PUTS_ERROR("    Incorrect value(s) read.");
-        } /* end for */
+    /* Verify data */
+    for(i = (size_t)hs_start; i < (size_t)(hs_start + hs_count); i++) {
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read (hyperslab).");
+    } /* end for */
 
     if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
     if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
     if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(hs_space) < 0) FAIL_STACK_ERROR
     if(H5Fclose(file) < 0) FAIL_STACK_ERROR
     PASSED();
     return 0;
@@ -724,6 +828,7 @@ test_read_file_set(hid_t fapl)
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
+        H5Sclose(hs_space);
         H5Fclose(file);
     } H5E_END_TRY;
     return 1;
@@ -746,54 +851,51 @@ test_read_file_set(hid_t fapl)
 static int
 test_write_file_set(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to which to write               */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   mem_space = -1;     /* memory data space                    */
-    hid_t   file_space = -1;    /* file data space                      */
-    hid_t   dset = -1;          /* dataset                              */
-    unsigned i;                 /* miscellaneous counters               */
-    int     fd = -1;            /* external file descriptor             */
-    int     part[25], whole[100];   /* raw data buffers                 */
-    hsize_t cur_size = 100;     /* current data space size              */
-    hsize_t max_size = 200;     /* maximum data space size              */
-    hsize_t hs_start = 100;     /* hyperslab starting offset            */
-    hsize_t hs_count = 100;     /* hyperslab size                       */
-    char    filename[1024];     /* file name                            */
-    int temparray[10] = {0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f};
+    hid_t	file = -1;          /* file to which to write               */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	mem_space = -1;     /* memory data space                    */
+    hid_t	file_space = -1;    /* file data space                      */
+    hid_t	dset = -1;          /* dataset                              */
+    unsigned i;                 /* miscellaneous counter                */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size = 100;     /* current data space size              */
+    hsize_t	max_size = 200;     /* maximum data space size              */
+    hsize_t	hs_start = 100;     /* hyperslab starting offset            */
+    hsize_t	hs_count = 100;     /* hyperslab size                       */
+    char	filename[1024];     /* file name                            */
 
     TESTING("write external dataset");
 
+    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+        TEST_ERROR
+
     /* Create another file */
-    h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
+    h5_fixname(FILENAME[2], fapl, filename, sizeof(filename));
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
-    /* Create the external file list */
-    if((dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0)
-        FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "extern_1b.raw", (off_t)0, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_2b.raw", (off_t)10, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_3b.raw", (off_t)20, (hsize_t)sizeof part) < 0 ||
-            H5Pset_external(dcpl, "extern_4b.raw", (off_t)30, H5F_UNLIMITED) < 0)
+    /* Create the dcpl and external file list */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
+    for(i = 0; i < N_EXT_FILES; i++) {
+        hsize_t size;
 
-    /* Make sure the output files are fresh*/
-    for(i=1; i<=4; i++) {
-        HDsprintf(filename, "extern_%db.raw", i);
-        if((fd= HDopen(filename, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) {
-            H5_FAILED();
-            printf("    cannot open %s: %s\n", filename, HDstrerror(errno));
-            goto error;
-        } /* end if */
+        HDsnprintf(filename, sizeof(filename), "extern_%dw.raw", (int) i + 1);
 
-        if(HDwrite(fd, temparray, (i-1)*10) < 0) {
-            H5_FAILED();
-            printf("    write error to file %s: %s\n", filename, HDstrerror(errno));
-            goto error;
-        }
-        HDclose(fd);
+        if(i != N_EXT_FILES -1)
+            size = (hsize_t)sizeof(part);
+        else
+            size = H5F_UNLIMITED;
+
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), size) < 0)
+            FAIL_STACK_ERROR
     } /* end for */
 
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
+        TEST_ERROR
+
     /* Create the dataset */
     if((mem_space = H5Screate_simple(1, &cur_size, &max_size)) < 0)
         FAIL_STACK_ERROR
@@ -807,11 +909,11 @@ test_write_file_set(hid_t fapl)
         whole[i] = (int)i;
     if(H5Dwrite(dset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < 4; i++) {
+    for(i = 0; i < N_EXT_FILES; i++) {
         char name1[64], name2[64];
 
-        HDsprintf(name1, "extern_%da.raw", i + 1);
-        HDsprintf(name2, "extern_%db.raw", i + 1);
+        HDsprintf(name1, "extern_%dr.raw", i + 1);
+        HDsprintf(name2, "extern_%dw.raw", i + 1);
         if(!files_have_same_contents(name1, name2))
             FAIL_PUTS_ERROR("   Output differs from expected value.")
     } /* end for */
@@ -853,16 +955,467 @@ test_write_file_set(hid_t fapl)
     return 1;
 } /* end test_write_file_set() */
 
+ 
+ /*-------------------------------------------------------------------------
+ * Function:    test_path_absolute
+ *
+ * Purpose:     Test absolute filenames for external files.
+ *              This will create an HDF5 file in a subdirectory which will
+ *              refer to /full/path/extern_*a.raw on unix and to
+ *              c:\full\path\extern_*a.raw and \full\path\extern_*a.raw on
+ *              windows.
+ *
+ * Return:      Success:    0
+ *              Failure:    1
+ *
+ * Programmer:  Steffen Kiess
+ *              March 10, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_path_absolute(hid_t fapl)
+{
+    hid_t	file = -1;          /* file to write to                     */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    size_t	i;                  /* miscellaneous counter                */
+    char	cwdpath[1024];      /* working directory                    */
+    char	filename[1024];     /* file name                            */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size;           /* current data space size              */
+
+    TESTING("absolute filenames for external file");
+
+    h5_fixname(FILENAME[3], fapl, filename, sizeof(filename));
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
+        TEST_ERROR
+
+    /* Create the dcpl */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        FAIL_STACK_ERROR
+    if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
+        TEST_ERROR
+    for(i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "%s%sextern_%dr.raw", cwdpath, H5_DIR_SEPS, (int) i + 1);
+#if defined(H5_HAVE_WINDOW_PATH)
+        /* For windows, test path-absolute case (\dir\file.raw) for the second file */
+        if(i == 1)
+            HDsnprintf(filename, sizeof(filename), "%s%sextern_%dr.raw", cwdpath + 2, H5_DIR_SEPS, i + 1);
+#endif
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    /* create the dataspace */
+    cur_size = TOTAL_SIZE;
+    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+        FAIL_STACK_ERROR
+
+    /* create the dataset */
+    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Read the entire dataset and compare with the original */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
+    for(i = 0; i < TOTAL_SIZE; i++)
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
+
+    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose(dset);
+        H5Sclose(space);
+        H5Pclose(dcpl);
+        H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* end test_path_absolute() */
+
 
 /*-------------------------------------------------------------------------
- * Function:    main
+ * Function:    test_path_relative
  *
- * Purpose:     Runs external dataset tests.
+ * Purpose:     Test external files with filename relative to current directory.
+ *              This will create an HDF5 file in a subdirectory which will
+ *              refer to extern_*a.raw
  *
- * Return:      Success:    exit(0)
- *              Failure:    exit(non-zero)
+ * Return:      Success:    0
+ *              Failure:    1
  *
- * Programmer:  Robb Matzke
+ * Programmer:  Steffen Kiess
+ *              March 10, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_path_relative(hid_t fapl)
+{
+    hid_t	file = -1;          /* file to write to                     */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dset = -1;          /* dataset                              */
+    size_t	i;                  /* miscellaneous counters               */
+    char	cwdpath[1024];      /* working directory                    */
+    char	filename[1024];     /* file name                            */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size;           /* current data space size              */
+
+    TESTING("filenames relative to current directory for external file");
+
+    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+        TEST_ERROR
+
+    if (HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
+        TEST_ERROR;
+
+    h5_fixname(FILENAME[4], fapl, filename, sizeof(filename));
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
+        TEST_ERROR
+
+    /* Create the dataset */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        FAIL_STACK_ERROR
+    if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
+        TEST_ERROR
+    for (i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "extern_%dr.raw", (int)i + 1);
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    cur_size = TOTAL_SIZE;
+    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+        FAIL_STACK_ERROR
+    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Read the entire dataset and compare with the original */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
+    for(i = 0; i < TOTAL_SIZE; i++)
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
+
+    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Dclose(dset);
+        H5Pclose(dcpl);
+        H5Sclose(space);
+        H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* end test_path_relative() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_path_relative_cwd
+ *
+ * Purpose:     Test external files with filename relative to current directory.
+ *              This will create an HDF5 file in a subdirectory which will
+ *              refer to ../extern_*a.raw
+ *              The files are then accessed by setting the efile_prefix dataset
+ *              access property to "${ORIGIN}".
+ *
+ * Return:      Success:    0
+ *              Failure:    1
+ *
+ * Programmer:  Steffen Kiess
+ *              March 10, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_path_relative_cwd(hid_t fapl)
+{
+    hid_t	file = -1;          /* file to write to                     */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dapl = -1;          /* dataset access property list         */
+    hid_t	dapl2 = -1;         /* copy of dapl                         */
+    hid_t	dset = -1;          /* dataset                              */
+    hid_t	dset2 = -1;         /* dataset, opened a second time        */
+    hid_t	dset3 = -1;         /* dataset, opened with different prefix    */
+    size_t	i;                  /* miscellaneous counters               */
+    char	cwdpath[1024];      /* working directory                    */
+    char	filename[1024];     /* file name                            */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size;           /* current data space size              */
+    char	buffer[1024];       /* buffer to read efile_prefix          */
+
+    TESTING("filenames relative to HDF5 file for external file");
+
+    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+        TEST_ERROR
+
+    if(HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
+        TEST_ERROR;
+
+    h5_fixname(FILENAME[4], fapl, filename, sizeof(filename));
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
+        TEST_ERROR
+
+    /* Create the dataset */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        FAIL_STACK_ERROR
+    if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
+        TEST_ERROR
+    for(i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "..%sextern_%dr.raw", H5_DIR_SEPS, (int)i + 1);
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    cur_size = TOTAL_SIZE;
+    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+        FAIL_STACK_ERROR
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+        FAIL_STACK_ERROR
+    if(H5Pset_efile_prefix(dapl, "${ORIGIN}") < 0)
+        FAIL_STACK_ERROR
+    if(H5Pget_efile_prefix(dapl, buffer, sizeof(buffer)) < 0)
+        FAIL_STACK_ERROR
+    if(HDstrcmp(buffer, "${ORIGIN}") != 0)
+        FAIL_PUTS_ERROR("efile prefix not set correctly");
+    if((dapl2 = H5Pcopy(dapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create dataset */
+    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, dapl2)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reopen dataset with same efile_prefix property */
+    if((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reopen dataset with different efile_prefix property */
+    if(H5Pset_efile_prefix(dapl, "//") < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY {
+        dset3 = H5Dopen2(file, "dset1", dapl);
+    } H5E_END_TRY;
+    if(dset3 >= 0)
+        FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
+
+    /* Read the entire dataset and compare with the original */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
+    for(i = 0; i < TOTAL_SIZE; i++)
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
+
+    /* Close dataset */
+    if(H5Dclose(dset2) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+
+    /* Open dataset (use a differend prefix than for create.
+     * This works because the dataset was closed.
+     */
+    if(H5Pset_efile_prefix(dapl2, "${ORIGIN}/.") < 0)
+        FAIL_STACK_ERROR
+    if((dset = H5Dopen2(file, "dset1", dapl2)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reopen dataset with same efile_prefix property */
+    if((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reopen dataset with different efile_prefix property */
+    if(H5Pset_efile_prefix(dapl, NULL) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY {
+        dset3 = H5Dopen2(file, "dset1", dapl);
+    } H5E_END_TRY;
+    if(dset3 >= 0)
+        FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
+
+    /* Read the entire dataset and compare with the original */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
+    for(i = 0; i < TOTAL_SIZE; i++)
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
+
+    if(H5Dclose(dset2) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dapl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(dapl2);
+        H5Pclose(dapl);
+        H5Dclose(dset3);
+        H5Dclose(dset2);
+        H5Dclose(dset);
+        H5Pclose(dcpl);
+        H5Sclose(space);
+        H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* end test_path_relative_cwd() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_path_env
+ *
+ * Purpose:     Test whether the value of HDF5_EXTFILE_PREFIX will overwrite
+ *              the efile_prefix dataset access property.
+ *              This will create an HDF5 file in a subdirectory which will
+ *              refer to ../extern_*a.raw
+ *              The files are then accessed by setting the HDF5_EXTFILE_PREFIX
+ *              environment variable to "${ORIGIN}".
+ *              The efile_prefix dataset access property is set to "someprefix",
+ *              which will cause an error if the value is not overwritten by
+ *              the environment variable.
+ *
+ * Return:      Success:    0
+ *              Failure:    1
+ *
+ * Programmer:  Steffen Kiess
+ *              March 10, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_path_env(hid_t fapl)
+{
+    hid_t	file = -1;          /* file to write to                     */
+    hid_t	dcpl = -1;          /* dataset creation properties          */
+    hid_t	space = -1;         /* data space                           */
+    hid_t	dapl = -1;          /* dataset access property list         */
+    hid_t	dset = -1;          /* dataset                              */
+    size_t	i;                  /* miscellaneous counters               */
+    char	cwdpath[1024];		/* working directory                    */
+    char	filename[1024];		/* file name                            */
+    int	    part[PART_SIZE];    /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
+    hsize_t	cur_size;           /* current data space size              */
+    char	buffer[1024];       /* buffer to read efile_prefix          */
+
+    TESTING("prefix in HDF5_EXTFILE_PREFIX");
+
+    if(HDsetenv("HDF5_EXTFILE_PREFIX", "${ORIGIN}", 1))
+        TEST_ERROR
+
+    if(HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
+        TEST_ERROR;
+
+    h5_fixname(FILENAME[4], fapl, filename, sizeof(filename));
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Reset the raw data files */
+    if(reset_raw_data_files() < 0)
+        TEST_ERROR
+
+    /* Create the dataset */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        FAIL_STACK_ERROR
+    if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
+        TEST_ERROR
+    for(i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "..%sextern_%dr.raw", H5_DIR_SEPS, (int) i + 1);
+        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+            FAIL_STACK_ERROR
+    } /* end for */
+
+    cur_size = TOTAL_SIZE;
+    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+        FAIL_STACK_ERROR
+    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Set prefix to a nonexistent directory, will be overwritten by environment variable */
+    if(H5Pset_efile_prefix(dapl, "someprefix") < 0)
+        FAIL_STACK_ERROR
+    if(H5Pget_efile_prefix(dapl, buffer, sizeof(buffer)) < 0)
+        FAIL_STACK_ERROR
+    if(HDstrcmp(buffer, "someprefix") != 0)
+        FAIL_PUTS_ERROR("efile prefix not set correctly");
+
+    /* Create dataset */
+    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, dapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Read the entire dataset and compare with the original */
+    HDmemset(whole, 0, sizeof(whole));
+    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+        FAIL_STACK_ERROR
+    for(i = 0; i < TOTAL_SIZE; i++)
+        if(whole[i] != (signed)i)
+            FAIL_PUTS_ERROR("Incorrect value(s) read.");
+
+    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dapl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    PASSED();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(dapl);
+        H5Dclose(dset);
+        H5Pclose(dcpl);
+        H5Sclose(space);
+        H5Fclose(file);
+    } H5E_END_TRY;
+    return 1;
+} /* end test_path_env() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	Runs external dataset tests.
+ *
+ * Return:	Success:	exit(0)
+ *
+ *		Failure:	exit(non-zero)
+ *
+ * Programmer:	Robb Matzke
  *              Tuesday, March  3, 1998
  *
  *-------------------------------------------------------------------------
@@ -870,13 +1423,13 @@ test_write_file_set(hid_t fapl)
 int
 main(void)
 {
-    hid_t   fapl_id_old = -1;   /* file access properties (old format)  */
-    hid_t   fapl_id_new = -1;   /* file access properties (new format)  */
-    hid_t   fid = -1;           /* file for test_1* functions           */
-    hid_t   gid = -1;           /* group to emit diagnostics            */
-    char    filename[1024];     /* file name for test_1* funcs          */
-    unsigned    latest_format;  /* default or latest file format        */
-    int     nerrors = 0;        /* number of errors                     */
+    hid_t	fapl_id_old = -1;   /* file access properties (old format)  */
+    hid_t	fapl_id_new = -1;   /* file access properties (new format)  */
+    hid_t	fid = -1;           /* file for test_1* functions           */
+    hid_t	gid = -1;           /* group to emit diagnostics            */
+    char	filename[1024];     /* file name for test_1* funcs          */
+    unsigned latest_format;     /* default or latest file format        */
+    int		nerrors = 0;        /* number of errors                     */
 
     h5_reset();
 
@@ -925,10 +1478,14 @@ main(void)
         nerrors += test_add_to_unlimited();
         nerrors += test_overflow();
 
-        /* These tests use the VFD-aware fapl */
+        /* These file set tests use the VFD-aware fapl */
         nerrors += test_read_file_set(current_fapl_id);
         nerrors += test_write_file_set(current_fapl_id);
-
+        nerrors += test_path_absolute(current_fapl_id);
+        nerrors += test_path_relative(current_fapl_id);
+        nerrors += test_path_relative_cwd(current_fapl_id);
+        nerrors += test_path_env(current_fapl_id);
+ 
         /* Verify symbol table messages are cached */
         nerrors += (h5_verify_cached_stabs(FILENAME, current_fapl_id) < 0 ? 1 : 0);
 
@@ -946,14 +1503,17 @@ main(void)
 
     /* Clean up files used by file set tests */
     if(h5_cleanup(FILENAME, fapl_id_old)) {
-        HDremove("extern_1a.raw");
-        HDremove("extern_1b.raw");
-        HDremove("extern_2a.raw");
-        HDremove("extern_2b.raw");
-        HDremove("extern_3a.raw");
-        HDremove("extern_3b.raw");
-        HDremove("extern_4a.raw");
-        HDremove("extern_4b.raw");
+        HDremove("extern_1r.raw");
+        HDremove("extern_2r.raw");
+        HDremove("extern_3r.raw");
+        HDremove("extern_4r.raw");
+
+        HDremove("extern_1w.raw");
+        HDremove("extern_2w.raw");
+        HDremove("extern_3w.raw");
+        HDremove("extern_4w.raw");
+
+        HDrmdir("extern_dir");
     } /* end if */
 
     return EXIT_SUCCESS;
@@ -969,3 +1529,4 @@ error:
     printf ("%d TEST%s FAILED.\n", nerrors, 1==nerrors?"":"s");
     return EXIT_FAILURE;
 } /* end main() */
+
diff --git a/test/tfile.c b/test/tfile.c
index 927ecab..db74720 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -52,6 +52,9 @@
 #define FILE1	"tfile1.h5"
 #define SFILE1	"sys_file1"
 
+#define REOPEN_FILE "tfile_reopen.h5"
+#define REOPEN_DSET "dset"
+
 #define F2_USERBLOCK_SIZE  (hsize_t)512
 #define F2_OFFSET_SIZE	   8
 #define F2_LENGTH_SIZE	   8
@@ -532,6 +535,59 @@ test_file_open(void)
 
 /****************************************************************
 **
+**  test_file_reopen(): File reopen test routine.
+**
+****************************************************************/
+static void
+test_file_reopen(void)
+{
+    hid_t   fid = -1;           /* file ID from initial open            */
+    hid_t   rfid = -1;          /* file ID from reopen                  */
+    hid_t   did = -1;           /* dataset ID (both opens)              */
+    hid_t   sid = -1;           /* dataspace ID for dataset creation    */
+    hsize_t dims = 6;           /* dataspace size                       */
+    herr_t  ret;                /* Generic return value                 */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing File Re-opening\n"));
+
+    /* Create file via first ID */
+    fid = H5Fcreate(REOPEN_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK_I(fid, "H5Fcreate");
+
+    /* Create a dataset in the file */
+    sid = H5Screate_simple(1, &dims, &dims);
+    CHECK_I(sid, "H5Screate_simple")
+    did = H5Dcreate2(fid, REOPEN_DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    CHECK_I(did, "H5Dcreate2");
+
+    /* Close dataset and dataspace */
+    ret = H5Sclose(sid);
+    CHECK(ret, FAIL, "H5Sclose");
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+
+    /* Reopen the file with a different file ID */
+    rfid = H5Freopen(fid);
+    CHECK_I(rfid, "H5Freopen");
+
+    /* Reopen the dataset through the reopen file ID */
+    did = H5Dopen2(rfid, REOPEN_DSET, H5P_DEFAULT);
+    CHECK_I(did, "H5Dopen2");
+
+    /* Close and clean up */
+    ret = H5Dclose(did);
+    CHECK(ret, FAIL, "H5Dclose");
+    ret = H5Fclose(fid);
+    CHECK(ret, FAIL, "H5Fclose");
+    ret = H5Fclose(rfid);
+    CHECK(ret, FAIL, "H5Fclose");
+    HDremove(REOPEN_FILE);
+
+}   /* test_file_reopen() */
+
+/****************************************************************
+**
 **  test_file_close():  low-level file close test routine.
 **                      It mainly tests behavior with close degree.
 **
@@ -3660,8 +3716,8 @@ test_file(void)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Low-Level File I/O\n"));
 
-    test_file_create();		/* Test file creation(also creation templates)*/
-    test_file_open();		/* Test file opening */
+    test_file_create();         /* Test file creation(also creation templates)*/
+    test_file_open();           /* Test file opening */
     test_file_close();          /* Test file close behavior */
     test_get_file_id();         /* Test H5Iget_file_id */
     test_get_obj_ids();         /* Test H5Fget_obj_ids for Jira Issue 8528 */