41 files changed, 21 insertions, 21 deletions
diff --git a/hl/tools/gif2h5/CMakeTests.cmake b/hl/tools/gif2h5/CMakeTests.cmake
index b2a8e27..dd0ccc4 100644
--- a/hl/tools/gif2h5/CMakeTests.cmake
+++ b/hl/tools/gif2h5/CMakeTests.cmake
@@ -22,9 +22,9 @@ file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 #
 # copy test files from source to build dir
 #
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
-HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/image1.gif" "${PROJECT_BINARY_DIR}/testfiles/image1.gif" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/h52giftst.h5" "${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5" "gif2h5_files")
+HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/ex_image2.h5" "${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5" "gif2h5_files")
 add_custom_target(gif2h5_files ALL COMMENT "Copying files needed by gif2h5 tests" DEPENDS ${gif2h5_files_list})
 
 # Remove any output file left over from previous test run
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index a7828b3..7c1a7f5 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -58,7 +58,7 @@ set (H5WATCH_TEST_FILES
 file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
 foreach (h5watch_file ${H5WATCH_TEST_FILES})
-  HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files")
 endforeach ()
 add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list})
 
diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c
index 443a759..abba782 100644
--- a/hl/tools/h5watch/extend_dset.c
+++ b/hl/tools/h5watch/extend_dset.c
@@ -403,8 +403,8 @@ main(int argc, char *argv[])
     } /* end if */
 
     /* Get the dataset name to be extended */
-    fname   = HDstrdup(argv[1]);
-    dname   = HDstrdup(argv[2]);
+    fname   = strdup(argv[1]);
+    dname   = strdup(argv[2]);
     action1 = atoi(argv[3]);
     action2 = atoi(argv[4]);
 
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 876b5d5..2e6071c 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -430,7 +430,7 @@ process_cmpd_fields(hid_t fid, char *dsetname)
     }
 
     /* Make a copy of "g_list_of_fields" */
-    if ((g_dup_fields = HDstrdup(g_list_of_fields)) == NULL) {
+    if ((g_dup_fields = strdup(g_list_of_fields)) == NULL) {
         error_msg("error in duplicating g_list_of_fields\n");
         ret_value = FAIL;
         goto done;
@@ -703,7 +703,7 @@ parse_command_line(int argc, const char *const *argv)
 
             case 'f': /* --fields=<list_of_fields> */
                 if (g_list_of_fields == NULL) {
-                    if ((g_list_of_fields = HDstrdup(H5_optarg)) == NULL) {
+                    if ((g_list_of_fields = strdup(H5_optarg)) == NULL) {
                         error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
                         leave(EXIT_FAILURE);
                     }
@@ -711,7 +711,7 @@ parse_command_line(int argc, const char *const *argv)
                 else {
                     char *str;
 
-                    if ((str = HDstrdup(H5_optarg)) == NULL) {
+                    if ((str = strdup(H5_optarg)) == NULL) {
                         error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
                         leave(EXIT_FAILURE);
                     }
@@ -823,7 +823,7 @@ main(int argc, char *argv[])
      * then there must have been something wrong with the file (perhaps it
      * doesn't exist).
      */
-    if ((fname = HDstrdup(argv[H5_optind])) == NULL) {
+    if ((fname = strdup(argv[H5_optind])) == NULL) {
         error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -877,7 +877,7 @@ main(int argc, char *argv[])
     else {
         *dname = '/';
         x      = dname;
-        if ((dname = HDstrdup(dname)) == NULL) {
+        if ((dname = strdup(dname)) == NULL) {
             error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__);
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
diff --git a/hl/tools/testfiles/w-err-cmpd1.err b/hl/tools/h5watch/testfiles/w-err-cmpd1.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd1.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd1.err
diff --git a/hl/tools/testfiles/w-err-cmpd2.err b/hl/tools/h5watch/testfiles/w-err-cmpd2.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd2.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd2.err
diff --git a/hl/tools/testfiles/w-err-cmpd3.err b/hl/tools/h5watch/testfiles/w-err-cmpd3.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd3.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd3.err
diff --git a/hl/tools/testfiles/w-err-cmpd4.err b/hl/tools/h5watch/testfiles/w-err-cmpd4.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd4.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd4.err
diff --git a/hl/tools/testfiles/w-err-cmpd5.err b/hl/tools/h5watch/testfiles/w-err-cmpd5.err
index 9c165fb..9c165fb 100644
--- a/hl/tools/testfiles/w-err-cmpd5.err
+++ b/hl/tools/h5watch/testfiles/w-err-cmpd5.err
diff --git a/hl/tools/testfiles/w-err-dset-nomax.err b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err
index fd5ca7e..fd5ca7e 100644
--- a/hl/tools/testfiles/w-err-dset-nomax.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset-nomax.err
diff --git a/hl/tools/testfiles/w-err-dset-none.err b/hl/tools/h5watch/testfiles/w-err-dset-none.err
index db781c3..db781c3 100644
--- a/hl/tools/testfiles/w-err-dset-none.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset-none.err
diff --git a/hl/tools/testfiles/w-err-dset1.err b/hl/tools/h5watch/testfiles/w-err-dset1.err
index d6b2a6e..d6b2a6e 100644
--- a/hl/tools/testfiles/w-err-dset1.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset1.err
diff --git a/hl/tools/testfiles/w-err-dset2.err b/hl/tools/h5watch/testfiles/w-err-dset2.err
index 3f77ec8..3f77ec8 100644
--- a/hl/tools/testfiles/w-err-dset2.err
+++ b/hl/tools/h5watch/testfiles/w-err-dset2.err
diff --git a/hl/tools/testfiles/w-err-file.err b/hl/tools/h5watch/testfiles/w-err-file.err
index 015661f..015661f 100644
--- a/hl/tools/testfiles/w-err-file.err
+++ b/hl/tools/h5watch/testfiles/w-err-file.err
diff --git a/hl/tools/testfiles/w-err-poll.ddl b/hl/tools/h5watch/testfiles/w-err-poll.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-poll.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-poll.ddl
diff --git a/hl/tools/testfiles/w-err-poll0.ddl b/hl/tools/h5watch/testfiles/w-err-poll0.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-poll0.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-poll0.ddl
diff --git a/hl/tools/testfiles/w-err-std.ddl b/hl/tools/h5watch/testfiles/w-err-std.ddl
index 775d6a0..775d6a0 100644
--- a/hl/tools/testfiles/w-err-std.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-std.ddl
diff --git a/hl/tools/testfiles/w-err-width.ddl b/hl/tools/h5watch/testfiles/w-err-width.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-err-width.ddl
+++ b/hl/tools/h5watch/testfiles/w-err-width.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
index 09255cc..09255cc 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
index 00ed390..00ed390 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
index 9b9a971..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl
index 9b9a971..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-esc.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
index 029e4db..029e4db 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
index 362cc94..362cc94 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-f2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
index 6a54b97..6a54b97 100644
--- a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-ff3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl
index 394d5a6..394d5a6 100644
--- a/hl/tools/testfiles/w-ext-cmpd-label.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-label.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
index 9b4c235..9b4c235 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f1.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
index 94b5c99..94b5c99 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-f3.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
index 482da31..482da31 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two-ff2.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl
index 57ffc2c..57ffc2c 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd-two.ddl
diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
index aac5be3..aac5be3 100644
--- a/hl/tools/testfiles/w-ext-cmpd.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-cmpd.ddl
diff --git a/hl/tools/testfiles/w-ext-early.ddl b/hl/tools/h5watch/testfiles/w-ext-early.ddl
index bb72104..bb72104 100644
--- a/hl/tools/testfiles/w-ext-early.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-early.ddl
diff --git a/hl/tools/testfiles/w-ext-late.ddl b/hl/tools/h5watch/testfiles/w-ext-late.ddl
index a6f8265..a6f8265 100644
--- a/hl/tools/testfiles/w-ext-late.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-late.ddl
diff --git a/hl/tools/testfiles/w-ext-one-d.ddl b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl
index 673370a..673370a 100644
--- a/hl/tools/testfiles/w-ext-one-d.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one-d.ddl
diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl
index 5df9dff..5df9dff 100644
--- a/hl/tools/testfiles/w-ext-one-simple.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one-simple.ddl
diff --git a/hl/tools/testfiles/w-ext-one.ddl b/hl/tools/h5watch/testfiles/w-ext-one.ddl
index 9604020..9604020 100644
--- a/hl/tools/testfiles/w-ext-one.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-one.ddl
diff --git a/hl/tools/testfiles/w-ext-two-d.ddl b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl
index 5c7af0a..5c7af0a 100644
--- a/hl/tools/testfiles/w-ext-two-d.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two-d.ddl
diff --git a/hl/tools/testfiles/w-ext-two-width.ddl b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl
index 9f09fde..9f09fde 100644
--- a/hl/tools/testfiles/w-ext-two-width.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two-width.ddl
diff --git a/hl/tools/testfiles/w-ext-two.ddl b/hl/tools/h5watch/testfiles/w-ext-two.ddl
index 28ff075..28ff075 100644
--- a/hl/tools/testfiles/w-ext-two.ddl
+++ b/hl/tools/h5watch/testfiles/w-ext-two.ddl
diff --git a/hl/tools/testfiles/w-help1.ddl b/hl/tools/h5watch/testfiles/w-help1.ddl
index e6510f2..e6510f2 100644
--- a/hl/tools/testfiles/w-help1.ddl
+++ b/hl/tools/h5watch/testfiles/w-help1.ddl
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
index fb047cd..a1daeec 100644
--- a/hl/tools/h5watch/testh5watch.sh.in
+++ b/hl/tools/h5watch/testh5watch.sh.in
@@ -66,7 +66,7 @@ fi
 nerrors=0
 verbose=yes
 
-test -d ../testfiles || mkdir ../testfiles
+test -d ./testfiles || mkdir ./testfiles
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -97,9 +97,9 @@ TESTING() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.err"
+    expect="$srcdir/testfiles/$1"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.err"
     shift
     retvalexpect=$1
     shift
@@ -146,10 +146,10 @@ TOOLTEST() {
 # $2 -- expected return code
 # $3 and on -- arguments for h5watch
 TOOLTEST_ERR() {
-    expect="$srcdir/../testfiles/$1"
-    expect_err="$srcdir/../testfiles/`basename $1 .ddl`.err"
-    actual="../testfiles/`basename $1 .ddl`.out"
-    actual_err="../testfiles/`basename $1 .ddl`.out.err"
+    expect="$srcdir/testfiles/$1"
+    expect_err="$srcdir/testfiles/`basename $1 .ddl`.err"
+    actual="testfiles/`basename $1 .ddl`.out"
+    actual_err="testfiles/`basename $1 .ddl`.out.err"
     shift
     retvalexpect=$1
     shift
@@ -201,8 +201,8 @@ try=0
 while [ $try -lt $TRY_MAX ] ;
 do
     cp $WATCHFILE $TESTFILE                             # Copy the file being watched/extended to a temporary file
-    actual="../testfiles/`basename $3 .ddl`.out"        # The actual output
-    expect="$srcdir/../testfiles/$3"                    # The expected output
+    actual="testfiles/`basename $3 .ddl`.out"        # The actual output
+    expect="$srcdir/testfiles/$3"                    # The expected output
     #
     # Set up options and object to h5watch
     if test -z "$2"; then