[svn-r18413] Description:

    Unify srcdir handling for test executables and allow them to use the srcdir
setting from configure time without requiring the 'srcdir' environment variable
be set (although you still can, to override the built in setting).  Attempted
to get this right for Windows builds also.

    Also add dependency between src/H5Tinit.c and src/libhdf5.settings, so
that the test/testcheck_version.sh script works correctly.

Tested on:
    Linux/32 2.6 (jam)
    Mac OS X/32 10.6.2 (amazon)

1 files changed, 1 insertions, 14 deletions

diff --git a/test/ohdr.c b/test/ohdr.c
index c3b8f8b..69b61ea 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -362,20 +362,7 @@ main(void)
         HDputs("Accessing objects with unknown header messages:");
         {
             hid_t file2;                    /* File ID for 'bogus' object file */
-            char testpath[512] = "";
-            char testfile[512] = "";
-            char *srcdir = HDgetenv("srcdir");
-
-            /* Build path to all test files */
-            if(srcdir && ((HDstrlen(srcdir) + 2) < sizeof(testpath))) {
-                HDstrcpy(testpath, srcdir);
-                HDstrcat(testpath, "/");
-            } /* end if */
-
-            /* Build path to test file */
-            if(srcdir && ((HDstrlen(testpath) + HDstrlen(FILE_BOGUS) + 1) < sizeof(testfile)))
-                HDstrcpy(testfile, testpath);
-            HDstrcat(testfile, FILE_BOGUS);
+            const char *testfile = H5_get_srcdir_filename(FILE_BOGUS);
 
             TESTING("object with unknown header message and no flags set");