From b5c63fb3fe6ee04b41d80368b406b5d45502ba00 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Fri, 20 Oct 2023 12:57:09 -0500
Subject: Test scripts now execute in-source with creation of tmp dir (#3723)

Fixes a few issues created in #3580:

* Fixes a problem where committed tools test files were deleted when cleaning after an in-source build
* Fixes issues with test file paths in Autotools tools test scripts
---
 CMakeInstallation.cmake                                    |  2 +-
 CMakePresets.json                                          |  2 +-
 tools/test/h5copy/testh5copy.sh.in                         |  2 +-
 tools/test/h5diff/h5diff_plugin.sh.in                      |  2 +-
 tools/test/h5diff/testh5diff.sh.in                         |  2 +-
 tools/test/h5dump/h5dump_plugin.sh.in                      |  2 +-
 tools/test/h5dump/testh5dump.sh.in                         |  2 +-
 tools/test/h5dump/testh5dumppbits.sh.in                    |  4 ++--
 tools/test/h5dump/testh5dumpvds.sh.in                      |  4 ++--
 tools/test/h5dump/testh5dumpxml.sh.in                      |  2 +-
 tools/test/h5format_convert/CMakeTests.cmake               |  8 ++++----
 tools/test/h5format_convert/expected/h5fc_ext1_f.ddl       |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext1_i.ddl       |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext1_s.ddl       |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext2_if.ddl      |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext2_is.ddl      |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl      |  2 +-
 tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl     |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl   |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl   |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl   |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl  |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl  |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl  |  2 +-
 tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl |  2 +-
 tools/test/h5format_convert/testh5fc.sh.in                 | 11 +++++++++--
 tools/test/h5import/h5importtestutil.sh.in                 |  2 +-
 tools/test/h5jam/testh5jam.sh.in                           |  2 +-
 tools/test/h5ls/h5ls_plugin.sh.in                          |  2 +-
 tools/test/h5ls/testh5ls.sh.in                             |  2 +-
 tools/test/h5ls/testh5lsvds.sh.in                          |  4 ++--
 tools/test/h5repack/h5repack.sh.in                         |  2 +-
 tools/test/h5repack/h5repack_plugin.sh.in                  |  2 +-
 tools/test/h5stat/testh5stat.sh.in                         |  2 +-
 tools/test/misc/testh5clear.sh.in                          |  2 +-
 tools/test/misc/testh5mkgrp.sh.in                          |  2 +-
 tools/test/misc/testh5repart.sh.in                         |  2 +-
 utils/tools/test/h5dwalk/copy_demo_files.sh.in             |  2 +-
 utils/tools/test/h5dwalk/testh5dwalk.sh.in                 |  2 +-
 39 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index d42142a..bb24476 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -151,9 +151,9 @@ if (HDF5_PACK_EXAMPLES)
       COMPONENT hdfdocuments
   )
 
-  option (EXAMPLES_USE_RELEASE_NAME "Use the released examples artifact name" OFF)
   option (EXAMPLES_DOWNLOAD "Download to use released examples files" OFF)
   if (EXAMPLES_DOWNLOAD)
+    option (EXAMPLES_USE_RELEASE_NAME "Use the released examples artifact name" OFF)
     if (EXAMPLES_USE_RELEASE_NAME)
       set (EXAMPLES_NAME ${EXAMPLES_TGZ_ORIGNAME})
     else ()
diff --git a/CMakePresets.json b/CMakePresets.json
index 7b70970..48393df 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -91,7 +91,7 @@
         "HDF5_EXAMPLES_COMPRESSED": {"type": "STRING", "value": "hdf5-examples-master.tar.gz"},
         "HDF5_EXAMPLES_COMPRESSED_DIR": {"type": "PATH", "value": "${sourceParentDir}/temp"},
         "EXAMPLES_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5-examples/releases/download/snapshot"},
-        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "snapshot.tar.gz"}
+        "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "hdf5-examples-2.0.4.tar.gz"}
       }
     },
     {
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index f2c4a8e..916e2be 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -84,7 +84,7 @@ nerrors=0
 verbose=yes
 h5haveexitcode=yes        # default is yes
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 # RUNSERIAL is used. Check if it can return exit code from executalbe correctly.
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index 525503d..f6783af 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -47,7 +47,7 @@ SRC_TOOLS="$srcdir/../.."
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
-TESTDIR=./testplug
+TESTDIR=./tmppl
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index efaac2e..1378f07 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -49,7 +49,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index d080c1d..c9e485d 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -48,7 +48,7 @@ SRC_TOOLS="$srcdir/../.."
 SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
-TESTDIR=./testplug
+TESTDIR=./tmppl
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 8796aa9..fdeb17d 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -66,7 +66,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 
 TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/std
+TESTDIR=./tmp
 test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
 test -d $TESTDIR || mkdir -p $TESTDIR
 
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index 4094bfc..e90cc86 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -58,7 +58,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 
 TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/pbits
+TESTDIR=./tmpbits
 test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
 test -d $TESTDIR || mkdir -p $TESTDIR
 
@@ -187,7 +187,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=$SRC_H5DUMP_TESTFILES/pbits
+    SDIR=$SRC_H5DUMP_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index e09e429..2bd38dc 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -58,7 +58,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 
 TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/vds
+TESTDIR=./tmpvds
 test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
 test -d $TESTDIR || mkdir -p $TESTDIR
 
@@ -166,7 +166,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=$SRC_H5DUMP_TESTFILES/vds
+    SDIR=$SRC_H5DUMP_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index b433fa2..880fc6b 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -49,7 +49,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
 TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/xml
+TESTDIR=./tmpxml
 test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
 test -d $TESTDIR || mkdir -p $TESTDIR
 
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 3046521..ab14a8c 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -378,11 +378,11 @@
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_file_ext}>"
-              -D "TEST_ARGS:STRING=-BH;./testfiles/${testname}-tmp.h5"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=testfiles/${testname}_chk.out"
+              -D "TEST_ARGS:STRING=-BH;${testname}-tmp.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${testname}_chk.out"
               -D "TEST_EXPECT=0"
-              -D "TEST_REFERENCE=testfiles/${testname}.ddl"
+              -D "TEST_REFERENCE=${testname}.ddl"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
       set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-dump PROPERTIES
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
index f788913..98806a7 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext1_f-tmp.h5" {
+HDF5 "h5fc_ext1_f-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
index 6564031..0372910 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext1_i-tmp.h5" {
+HDF5 "h5fc_ext1_i-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
index 746de2b..f97ebf3 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext1_s-tmp.h5" {
+HDF5 "h5fc_ext1_s-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
index 57781ec..003defc 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext2_if-tmp.h5" {
+HDF5 "h5fc_ext2_if-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
index 8fd061d..6b5d0d6 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext2_is-tmp.h5" {
+HDF5 "h5fc_ext2_is-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
index 435ed46..47e8c3b 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext2_sf-tmp.h5" {
+HDF5 "h5fc_ext2_sf-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
index 57a78d3..bd7058a 100644
--- a/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/h5fc_ext3_isf-tmp.h5" {
+HDF5 "h5fc_ext3_isf-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
index 45fa3fb..420191b 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext1_f-tmp.h5" {
+HDF5 "old_h5fc_ext1_f-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
index 67a7116..1ea1663 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext1_i-tmp.h5" {
+HDF5 "old_h5fc_ext1_i-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 1
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
index 7f67d9f..eeaece7 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext1_s-tmp.h5" {
+HDF5 "old_h5fc_ext1_s-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
index 350d3ba..40a7f69 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext2_if-tmp.h5" {
+HDF5 "old_h5fc_ext2_if-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
index 6b2b2c3..d83042a 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext2_is-tmp.h5" {
+HDF5 "old_h5fc_ext2_is-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
index 4a038e3..4cc7b2f 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext2_sf-tmp.h5" {
+HDF5 "old_h5fc_ext2_sf-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
index 602627f..e3bb994 100644
--- a/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/old_h5fc_ext3_isf-tmp.h5" {
+HDF5 "old_h5fc_ext3_isf-tmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in
index 4ba46cb..756156e 100644
--- a/tools/test/h5format_convert/testh5fc.sh.in
+++ b/tools/test/h5format_convert/testh5fc.sh.in
@@ -62,7 +62,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles"
 SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 # Copy the testfile to a temporary file for testing as h5format_convert is changing the file in place
@@ -419,8 +419,15 @@ H5DUMP_CHECK() {
     actual="$TESTDIR/`basename $2 .ddl`.out"
     actual_err="$TESTDIR/`basename $2 .ddl`.err"
     testfile="`basename $2 .ddl`-tmp.h5"
-    $RUNSERIAL $H5DUMP_BIN -BH $TESTDIR/$testfile > $actual 2>$actual_err
+    # Run test.
+    (
+    cd $TESTDIR
+    $RUNSERIAL $H5DUMP_BIN -BH $testfile 
+    ) >$actual 2>$actual_err
     cat $actual_err >> $actual
+    cp $actual $actual_sav
+    cp $actual_err $actual_err_sav
+    STDERR_FILTER $actual_err
 
     # Compare output
     COMPARE_OUT $expect $actual
diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in
index 65b899f..04582ee 100644
--- a/tools/test/h5import/h5importtestutil.sh.in
+++ b/tools/test/h5import/h5importtestutil.sh.in
@@ -52,7 +52,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in
index 49598da..ee34377 100644
--- a/tools/test/h5jam/testh5jam.sh.in
+++ b/tools/test/h5jam/testh5jam.sh.in
@@ -55,7 +55,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 3408876..8b606d6 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -49,7 +49,7 @@ SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
 SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
-TESTDIR=./testplug
+TESTDIR=./tmppl
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index fc6daab..01f9402 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -54,7 +54,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles"
 SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index 2408ee2..9038cf1 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -51,7 +51,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/vds
+TESTDIR=./tmpvds
 test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
 test -d $TESTDIR || mkdir $TESTDIR
 
@@ -145,7 +145,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=$SRC_H5LS_TESTFILES/vds
+    SDIR=$SRC_H5LS_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index f3b8d3e..ac213f1 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -68,7 +68,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
-TESTDIR=./testpack
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index 43be1ee..a39cd7b 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -49,7 +49,7 @@ SRC_TOOLS="$srcdir/../.."
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
-TESTDIR=testplug
+TESTDIR=./tmppl
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 7ce0ad4..1d732c6 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -51,7 +51,7 @@ SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected"
 
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 ######################################################################
diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index b5bf5cc..2306d58 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -44,7 +44,7 @@ SRC_TOOLS="$srcdir/../.."
 SRC_H5CLEAR_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
 SRC_H5CLEAR_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
-TESTDIR=./testh5clear
+TESTDIR=./tmpclr
 test -d $TESTDIR || mkdir -p $TESTDIR
 
 ######################################################################
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index 676f6b0..297f89f 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -43,7 +43,7 @@ SRC_TOOLS="$srcdir/../.."
 SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
 SRC_H5MKGRP_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
-TESTDIR=./testgrp
+TESTDIR=./tmpmkg
 test -d $TESTDIR || mkdir -p $TESTDIR
 
 ######################################################################
diff --git a/tools/test/misc/testh5repart.sh.in b/tools/test/misc/testh5repart.sh.in
index addd0db..e101b08 100644
--- a/tools/test/misc/testh5repart.sh.in
+++ b/tools/test/misc/testh5repart.sh.in
@@ -40,7 +40,7 @@ SRC_TOOLS="$srcdir/../.."
 
 SRC_H5REPART_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
 
-TESTDIR=./testrepart
+TESTDIR=./tmprp
 test -d $TESTDIR || mkdir -p $TESTDIR
 
 #
diff --git a/utils/tools/test/h5dwalk/copy_demo_files.sh.in b/utils/tools/test/h5dwalk/copy_demo_files.sh.in
index 02df202..8ccc5e8 100644
--- a/utils/tools/test/h5dwalk/copy_demo_files.sh.in
+++ b/utils/tools/test/h5dwalk/copy_demo_files.sh.in
@@ -30,7 +30,7 @@ exit_code=$EXIT_SUCCESS
 
 
 # Add Testing files into the local testfiles directory::
-TESTDIR=./testfiles
+TESTDIR=./tmp
 test -d $TESTDIR || mkdir $TESTDIR
 
 echo "HDF5 \"$THIS_DIR/testfiles/h5diff_basic1.h5\" {" > "$THIS_DIR"/testfiles/h5diff_basic1.h5_h5dump.txt
diff --git a/utils/tools/test/h5dwalk/testh5dwalk.sh.in b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
index a123f8d..694dad0 100644
--- a/utils/tools/test/h5dwalk/testh5dwalk.sh.in
+++ b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
@@ -68,7 +68,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/h5jam/testfiles"
 SRC_H5DWALK_TESTFILES="$SRC_TOOLS/h5dwalk/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/h5import/testfiles"
 
-TESTDIR=./testfiles
+TESTDIR=./tmpdw
 test -d $TESTDIR || mkdir $TESTDIR
 
 echo "SRC_H5DIFF_TESTFILES = $SRC_H5DIFF_TESTFILES"
-- 
cgit v0.12