From cd2534d9bad3151c5fda97c3a0f910e78f43a2df Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Thu, 18 Mar 2010 07:04:39 -0500
Subject: [svn-r18418] Description:     Centralize common code for srcdir
 lookups.

Tested on:
    Mac OS X/32 10.6.2 (amazon) w/debug & prod
    Linux/32 2.6 (jam)
---
 c++/test/H5srcdir.h.in            | 45 --------------------------------
 hl/test/H5srcdir.h.in             | 45 --------------------------------
 perform/H5srcdir.h.in             | 45 --------------------------------
 test/H5srcdir.h.in                | 45 --------------------------------
 test/h5test.h                     | 55 ++++++++++++++++++++++++++++++++++++++-
 testpar/H5srcdir.h.in             | 45 --------------------------------
 tools/h5repack/H5srcdir.h.in      | 45 --------------------------------
 windows/c++/test/H5srcdir.h       | 45 --------------------------------
 windows/hl/test/H5srcdir.h        | 45 --------------------------------
 windows/perform/H5srcdir.h        | 45 --------------------------------
 windows/test/H5srcdir.h           | 45 --------------------------------
 windows/tools/h5repack/H5srcdir.h | 45 --------------------------------
 12 files changed, 54 insertions(+), 496 deletions(-)

diff --git a/c++/test/H5srcdir.h.in b/c++/test/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/c++/test/H5srcdir.h.in
+++ b/c++/test/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/hl/test/H5srcdir.h.in b/hl/test/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/hl/test/H5srcdir.h.in
+++ b/hl/test/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/perform/H5srcdir.h.in b/perform/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/perform/H5srcdir.h.in
+++ b/perform/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/test/H5srcdir.h.in b/test/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/test/H5srcdir.h.in
+++ b/test/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/test/h5test.h b/test/h5test.h
index ed538cf..4ada6c5 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -24,7 +24,6 @@
 
 #include "hdf5.h"
 #include "H5private.h"
-#include "H5srcdir.h"
 
 #ifdef H5_STDC_HEADERS
 #   include <signal.h>
@@ -143,6 +142,60 @@ extern MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 #define DBL_REL_EQUAL(X,Y,M)    (fabs((Y-X)/X)<M)
 #define LDBL_REL_EQUAL(X,Y,M)    (fabsl((Y-X)/X)<M)
 
+/* =================================== */
+/* Support for srcdir queries in tests */
+/* =================================== */
+#include "H5srcdir.h"
+
+/* Buffer to construct path in and return pointer to */
+static char srcdir_path[1024] = "";
+
+/* Buffer to construct file in and return pointer to */
+static char srcdir_testpath[1024] = "";
+
+/* Append the test file name to the srcdir path and return the whole string */
+static const char *H5_get_srcdir_filename(const char *filename)
+{
+    const char *srcdir = HDgetenv("srcdir");
+
+    /* Check for using the srcdir from configure time */
+    if(NULL == srcdir)
+        srcdir = config_srcdir;
+
+    /* Build path to test file */
+    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
+        HDstrcpy(srcdir_testpath, srcdir);
+        HDstrcat(srcdir_testpath, "/");
+        HDstrcat(srcdir_testpath, filename);
+        return(srcdir_testpath);
+    } /* end if */
+    else
+        return(NULL);
+}
+
+/* Just return the srcdir path */
+static const char *H5_get_srcdir(void)
+{
+    const char *srcdir = HDgetenv("srcdir");
+
+    /* Check for using the srcdir from configure time */
+    if(NULL == srcdir)
+        srcdir = config_srcdir;
+
+    /* Build path to all test files */
+    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
+        HDstrcpy(srcdir_path, srcdir);
+        HDstrcat(srcdir_path, "/");
+        return(srcdir_path);
+    } /* end if */
+    else
+        return(NULL);
+}
+
+/* ========================================== */
+/* End of support for srcdir queries in tests */
+/* ========================================== */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/testpar/H5srcdir.h.in b/testpar/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/testpar/H5srcdir.h.in
+++ b/testpar/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/tools/h5repack/H5srcdir.h.in b/tools/h5repack/H5srcdir.h.in
index 1e10a71..d472124 100644
--- a/tools/h5repack/H5srcdir.h.in
+++ b/tools/h5repack/H5srcdir.h.in
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = "@srcdir@";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/windows/c++/test/H5srcdir.h b/windows/c++/test/H5srcdir.h
index ca9ec78..4d32264 100644
--- a/windows/c++/test/H5srcdir.h
+++ b/windows/c++/test/H5srcdir.h
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = ".";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/windows/hl/test/H5srcdir.h b/windows/hl/test/H5srcdir.h
index ca9ec78..4d32264 100644
--- a/windows/hl/test/H5srcdir.h
+++ b/windows/hl/test/H5srcdir.h
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = ".";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/windows/perform/H5srcdir.h b/windows/perform/H5srcdir.h
index ca9ec78..4d32264 100644
--- a/windows/perform/H5srcdir.h
+++ b/windows/perform/H5srcdir.h
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = ".";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/windows/test/H5srcdir.h b/windows/test/H5srcdir.h
index ca9ec78..4d32264 100644
--- a/windows/test/H5srcdir.h
+++ b/windows/test/H5srcdir.h
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = ".";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
diff --git a/windows/tools/h5repack/H5srcdir.h b/windows/tools/h5repack/H5srcdir.h
index ca9ec78..4d32264 100644
--- a/windows/tools/h5repack/H5srcdir.h
+++ b/windows/tools/h5repack/H5srcdir.h
@@ -20,48 +20,3 @@
 /* Set the 'srcdir' path from configure time */
 static const char *config_srcdir = ".";
 
-/* Buffer to construct path in and return pointer to */
-static char srcdir_path[1024] = "";
-
-/* Buffer to construct file in and return pointer to */
-static char srcdir_testpath[1024] = "";
-
-/* Append the test file name to the srcdir path and return the whole string */
-static const char *H5_get_srcdir_filename(const char *filename)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to test file */
-    if((HDstrlen(srcdir) + HDstrlen(filename) + 2) < sizeof(srcdir_testpath)) {
-        HDstrcpy(srcdir_testpath, srcdir);
-        HDstrcat(srcdir_testpath, "/");
-        HDstrcat(srcdir_testpath, filename);
-        return(srcdir_testpath);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-/* Just return the srcdir path */
-static const char *H5_get_srcdir(void)
-{
-    const char *srcdir = HDgetenv("srcdir");
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    /* Build path to all test files */
-    if((HDstrlen(srcdir) + 2) < sizeof(srcdir_path)) {
-        HDstrcpy(srcdir_path, srcdir);
-        HDstrcat(srcdir_path, "/");
-        return(srcdir_path);
-    } /* end if */
-    else
-        return(NULL);
-}
-
-- 
cgit v0.12