[svn-r25682] bring 25651 and 25659 from trunk.

Fix for: HDFFV-8715
HDF5_PARAPREFIX is ignored in parallel dense attribute and performance tests.

2 files changed, 76 insertions, 22 deletions

diff --git a/test/h5test.c b/test/h5test.c
index fce8c9b..f434823 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -92,6 +92,8 @@ MPI_Info    h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */
 static const char *multi_letters = "msbrglo";
 
 static herr_t h5_errors(hid_t estack, void *client_data);
+static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, 
+                              char *fullname, size_t size);
 
 
 /*-------------------------------------------------------------------------
@@ -268,9 +270,59 @@ h5_reset(void)
 char *
 h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 {
+    return (h5_fixname_real(base_name, fapl, ".h5", fullname, size));
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:  h5_fixname_no_suffix
+ *
+ * Purpose:  Same as h5_fixname but with no suffix appended
+ *
+ * Return:  Success:  The FULLNAME pointer.
+ *
+ *    Failure:  NULL if BASENAME or FULLNAME is the null
+ *        pointer or if FULLNAME isn't large enough for
+ *        the result.
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size)
+{
+    return (h5_fixname_real(base_name, fapl, NULL, fullname, size));
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:  h5_fixname_real
+ *
+ * Purpose:  Create a file name from a file base name like `test' and
+ *    return it through the FULLNAME (at most SIZE characters
+ *    counting the null terminator). The full name is created by
+ *    prepending the contents of HDF5_PREFIX (separated from the
+ *    base name by a slash) and appending a file extension based on
+ *    the driver supplied, resulting in something like
+ *    `ufs:/u/matzke/test.h5'.
+ *
+ * Return:  Success:  The FULLNAME pointer.
+ *
+ *    Failure:  NULL if BASENAME or FULLNAME is the null
+ *        pointer or if FULLNAME isn't large enough for
+ *        the result.
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, November 19, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+static char *
+h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, 
+                char *fullname, size_t size)
+{
     const char     *prefix = NULL;
-    const char     *suffix = ".h5";     /* suffix has default */
     char           *ptr, last = '\0';
+    const char     *suffix = _suffix;
     size_t          i, j;
     hid_t           driver = -1;
     int             isppdriver = 0;  /* if the driver is MPI parallel */
@@ -285,10 +337,12 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
         if((driver = H5Pget_driver(fapl)) < 0)
             return NULL;
 
-        if(H5FD_FAMILY == driver)
-            suffix = "%05d.h5";
-        else if (H5FD_MULTI == driver)
-            suffix = NULL;
+        if(suffix) {
+            if(H5FD_FAMILY == driver)
+                suffix = "%05d.h5";
+            else if (H5FD_MULTI == driver)
+                suffix = NULL;
+        }
     }
 
     /* Must first check fapl is not H5P_DEFAULT (-1) because H5FD_XXX
@@ -318,11 +372,11 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
      */
     if(isppdriver) {
 #ifdef H5_HAVE_PARALLEL
-  /*
+        /*
          * For parallel:
          *      First use command line option, then the environment
          *      variable, then try the constant
-   */
+         */
         static int explained = 0;
 
         prefix = (paraprefix ? paraprefix : getenv_all(MPI_COMM_WORLD, 0, "HDF5_PARAPREFIX"));
@@ -335,12 +389,12 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
 
             if (mpi_rank == 0)
                 printf("*** Hint ***\n"
-                        "You can use environment variable HDF5_PARAPREFIX to "
-                        "run parallel test files in a\n"
-                        "different directory or to add file type prefix. E.g.,\n"
-                        "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
-                        "   export HDF5_PARAPREFIX\n"
-                        "*** End of Hint ***\n");
+                       "You can use environment variable HDF5_PARAPREFIX to "
+                       "run parallel test files in a\n"
+                       "different directory or to add file type prefix. E.g.,\n"
+                       "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
+                       "   export HDF5_PARAPREFIX\n"
+                       "*** End of Hint ***\n");
 
             explained = TRUE;
 #ifdef HDF5_PARAPREFIX
@@ -352,7 +406,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
         /*
          * For serial:
          *      First use the environment variable, then try the constant
-        */
+         */
         prefix = HDgetenv("HDF5_PREFIX");
 
 #ifdef HDF5_PREFIX
@@ -425,18 +479,18 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
                 return NULL;
         }
     } else if (HDstrlen(base_name) >= size) {
-  /* Buffer is too small */
-  return NULL;
+        /* Buffer is too small */
+        return NULL;
     } else {
-  HDstrcpy(fullname, base_name);
-   }
+        HDstrcpy(fullname, base_name);
+    }
 
     /* Append a suffix */
     if (suffix) {
-  if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+        if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
             return NULL;
 
-  HDstrcat(fullname, suffix);
+        HDstrcat(fullname, suffix);
     }
 
     /* Remove any double slashes in the filename */
diff --git a/test/h5test.h b/test/h5test.h
index 90e4cad..d31e963 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -141,8 +141,8 @@ extern "C" {
 
 /* Generally useful testing routines */
 H5TEST_DLL int h5_cleanup(const char *base_name[], hid_t fapl);
-H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname,
-		 size_t size);
+H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size);
+H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size);
 H5TEST_DLL hid_t h5_fileaccess(void);
 H5TEST_DLL void h5_no_hwconv(void);
 H5TEST_DLL const char *h5_rmprefix(const char *filename);