From a82edeb89b88e359cef1f2e0c1a8bd6812ca63b6 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Thu, 16 Jun 2016 11:54:45 -0500
Subject: [svn-r30085] changed from CHARACTER to CHARACTER(LEN=*), and moved
 the LEN of an optional argument into the optional check loop.

---
 fortran/src/H5Eff.F90 | 3 ++-
 fortran/src/H5Pff.F90 | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index 7a0b15b..4198321 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -141,8 +141,9 @@ CONTAINS
        INTEGER FUNCTION h5eprint_c2()  BIND(C,NAME='h5eprint_c2')
        END FUNCTION h5eprint_c2
     END INTERFACE
-    namelen = LEN(NAME)
+
     IF (PRESENT(name)) THEN
+       namelen = LEN(NAME)
        hdferr = h5eprint_c1(name, namelen)
     ELSE
        hdferr = h5eprint_c2()
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index e052ea0..a49de81 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -6260,7 +6260,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                           ! of fillvalue datatype
                                           ! (in memory)
-    CHARACTER, INTENT(IN), TARGET :: fillvalue ! Fillvalue
+    CHARACTER(LEN=*), INTENT(IN), TARGET :: fillvalue ! Fillvalue
     INTEGER, INTENT(OUT) :: hdferr             ! Error code
     TYPE(C_PTR) :: f_ptr                       ! C address
 
@@ -6275,7 +6275,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                           ! of fillvalue datatype
                                           ! (in memory)
-    CHARACTER, INTENT(OUT) :: fillvalue   ! Fillvalue
+    CHARACTER(LEN=*), INTENT(OUT) :: fillvalue   ! Fillvalue
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
     INTEGER :: i
-- 
cgit v0.12


From bdcb43071a09c2b54c1e73c66218a0d5d626b560 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Thu, 16 Jun 2016 13:00:13 -0500
Subject: [svn-r30087] fixed issue of CHARACTER argument of c_loc having a
 length of 1

---
 fortran/src/H5Pff.F90 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index a49de81..c42dde2 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -6264,7 +6264,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     INTEGER, INTENT(OUT) :: hdferr             ! Error code
     TYPE(C_PTR) :: f_ptr                       ! C address
 
-    f_ptr = C_LOC(fillvalue)
+    f_ptr = C_LOC(fillvalue(1:1))
     hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
 
   END SUBROUTINE h5pset_fill_value_char
@@ -6286,7 +6286,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     ! To resolve Issue #1 outlined in the preamble of this file we
     ! need to pack the character string into an array.
 
-    chr_len = LEN(fillvalue)
+    chr_len = LEN(fillvalue(1:1))
     ALLOCATE(chr(1:chr_len), STAT=hdferr)
     IF (hdferr .NE. 0) THEN
        hdferr = -1
-- 
cgit v0.12


From dd4744d3f60f6add7e4d1a01e23a902eb1171b25 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Thu, 16 Jun 2016 13:58:43 -0500
Subject: [svn-r30089] fixed issue of CHARACTER argument of c_loc having a
 length of 1

---
 fortran/src/H5Pff.F90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index c42dde2..532ecc6 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -6260,7 +6260,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                           ! of fillvalue datatype
                                           ! (in memory)
-    CHARACTER(LEN=*), INTENT(IN), TARGET :: fillvalue ! Fillvalue
+    CHARACTER(LEN=1), INTENT(IN), TARGET :: fillvalue ! Fillvalue
     INTEGER, INTENT(OUT) :: hdferr             ! Error code
     TYPE(C_PTR) :: f_ptr                       ! C address
 
-- 
cgit v0.12


From f410d5d842edfb8a3b4aea4cd72ff67cb0e5b1aa Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Sun, 19 Jun 2016 03:48:44 -0500
Subject: [svn-r30095] Description:     Bring over fixes for CMake testing from
 the revise_chunks branch

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
    (h5committest forthcoming)
---
 tools/h5format_convert/testfiles/h5fc_ext1_f.ddl   |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext1_i.ddl   |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext1_s.ddl   |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext2_if.ddl  |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext2_is.ddl  |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl  |  2 +-
 tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl |  2 +-
 tools/h5format_convert/testfiles/h5fc_v_all.ddl    |  2 +-
 tools/h5format_convert/testfiles/h5fc_v_bt1.ddl    |  2 +-
 tools/h5format_convert/testfiles/h5fc_v_err.ddl    |  2 +-
 tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl   |  2 +-
 tools/h5format_convert/testfiles/h5fc_v_n_all.ddl  |  2 +-
 .../testfiles/h5fc_v_ndata_bt1.ddl                 |  2 +-
 .../testfiles/h5fc_v_non_chunked.ddl               |  2 +-
 .../h5format_convert/testfiles/old_h5fc_ext1_f.ddl |  2 +-
 .../h5format_convert/testfiles/old_h5fc_ext1_i.ddl |  2 +-
 .../h5format_convert/testfiles/old_h5fc_ext1_s.ddl |  2 +-
 .../testfiles/old_h5fc_ext2_if.ddl                 |  2 +-
 .../testfiles/old_h5fc_ext2_is.ddl                 |  2 +-
 .../testfiles/old_h5fc_ext2_sf.ddl                 |  2 +-
 .../testfiles/old_h5fc_ext3_isf.ddl                |  2 +-
 tools/h5format_convert/testh5fc.sh.in              | 82 ++++++++++++----------
 22 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/h5format_convert/testfiles/h5fc_v_all.ddl
index 5e7365d..a1af831 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_all.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_all.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_CONTIGUOUS...
 Open the dataset
diff --git a/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
index c501eb0..31de12a 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /GROUP/DSET_BT2...
 Open the dataset
 Retrieve the dataset's layout
diff --git a/tools/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/h5format_convert/testfiles/h5fc_v_err.ddl
index 4a728e8..b671db0 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_err.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_err.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_ERR...
 Open the dataset
diff --git a/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
index ff5da4a..fcdadd8 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_EA...
 Open the dataset
 Retrieve the dataset's layout
diff --git a/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
index d2ffbbf..074ce6f 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Processing all datasets in the file...
 Going to process dataset:/DSET_CONTIGUOUS...
 Open the dataset
diff --git a/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
index ba794a7..c75699a 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
@@ -1,6 +1,6 @@
 Process command line options
 It is noop...
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_NDATA_BT2...
 Open the dataset
 Retrieve the dataset's layout
diff --git a/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
index aba0740..5945389 100644
--- a/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+++ b/tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
@@ -1,5 +1,5 @@
 Process command line options
-Open the file tmp.h5
+Open the file outtmp.h5
 Going to process dataset: /DSET_CONTIGUOUS...
 Open the dataset
 Retrieve the dataset's layout
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
index c906082..d1768c8 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 1
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
index fb5192d..dae9284 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
index 2fff4ac..8ec4656 100644
--- a/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+++ b/tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
@@ -1,4 +1,4 @@
-HDF5 "./testfiles/tmp.h5" {
+HDF5 "./testfiles/dmptmp.h5" {
 SUPER_BLOCK {
    SUPERBLOCK_VERSION 2
    FREELIST_VERSION 0
diff --git a/tools/h5format_convert/testh5fc.sh.in b/tools/h5format_convert/testh5fc.sh.in
index 000425b..0d74697 100644
--- a/tools/h5format_convert/testh5fc.sh.in
+++ b/tools/h5format_convert/testh5fc.sh.in
@@ -69,7 +69,10 @@ TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
 
 # Copy the testfile to a temporary file for testing as h5format_convert is changing the file in place
+TMPOUTFILE=outtmp.h5
 TMPFILE=tmp.h5
+TMPCHKFILE=chktmp.h5
+TMPDMPFILE=dmptmp.h5
 
 ######################################################################
 # test files
@@ -170,7 +173,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=`$DIRNAME $tstfile`
+    SDIR=$SRC_H5FORMCONV_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
@@ -213,11 +216,11 @@ TOOLTEST_OUT() {
     actual_err_sav=${actual_err}-sav
 
     # Prepare the test file
-    $RM $TESTDIR/$TMPFILE
+    $RM $TESTDIR/$TMPOUTFILE
     TFILE=$2
     if [ ! -z "$2" ] && [ -e $TESTDIR/$2 ] ; then
-	$CP $TESTDIR/$2 $TESTDIR/$TMPFILE
-	TFILE=$TMPFILE
+	$CP $TESTDIR/$2 $TESTDIR/$TMPOUTFILE
+	TFILE=$TMPOUTFILE
     fi
 
     # Run test.
@@ -245,14 +248,15 @@ TOOLTEST_OUT() {
 # $1 is the test file name 
 #	--fname exists
 #	--fname is copied to a temporary file for testing
-# $2 to at most $4--options to the tool such as:
+# $2 is the temporary file name 
+# $3 to at most $5--options to the tool such as:
 # 	-d dname
 # 	-n
 TOOLTEST() {
-    TESTING $FORMCONV $2 $3 $4 $1
-    $RM $TESTDIR/$TMPFILE
-    $CP $TESTDIR/$1 $TESTDIR/$TMPFILE
-    $RUNSERIAL $FORMCONV_BIN $2 $3 $4 $TESTDIR/$TMPFILE
+    TESTING $FORMCONV $3 $4 $5 $1
+    $RM $TESTDIR/$2
+    $CP $TESTDIR/$1 $TESTDIR/$2
+    $RUNSERIAL $FORMCONV_BIN $3 $4 $5 $TESTDIR/$2
     exitcode=$?
     if [ $exitcode -ne 0 ]; then
 	echo "*FAILED*"
@@ -272,7 +276,7 @@ CHECKING() {
 # $1 dataset name
 IDX_CHECK() {
     CHECKING $1
-    $RUNSERIAL $CHK_IDX_BIN $TESTDIR/$TMPFILE $1
+    $RUNSERIAL $CHK_IDX_BIN $TESTDIR/$TMPCHKFILE $1
     ret=$?
     if [ $ret -eq 0 ]; then
 	echo " PASSED"
@@ -304,7 +308,7 @@ H5DUMP_CHECK() {
     expect="$TESTDIR/$2"
     actual="$TESTDIR/`basename $2 .ddl`.out"
     actual_err="$TESTDIR/`basename $2 .ddl`.err"
-    $RUNSERIAL $H5DUMP_BIN -BH $TESTDIR/$TMPFILE > $actual 2>$actual_err
+    $RUNSERIAL $H5DUMP_BIN -BH $TESTDIR/$TMPDMPFILE > $actual 2>$actual_err
     cat $actual_err >> $actual
 
     # Compare output
@@ -387,28 +391,28 @@ TOOLTEST_OUT h5fc_v_err.ddl h5fc_err_level.h5 -v
 # h5format_convert -d /GROUP/DSET_FA h5fc_ext_none.h5
 # h5format_convert -d /DSET_NONE h5fc_ext_none.h5
 # h5format_convert -d /GROUP/DSET_NDATA_NONE h5fc_ext_none.h5
-TOOLTEST h5fc_ext_none.h5 -d /DSET_EA
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /DSET_EA
 IDX_CHECK /DSET_EA
 #
-TOOLTEST h5fc_ext_none.h5 -d /GROUP/DSET_NDATA_EA
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /GROUP/DSET_NDATA_EA
 IDX_CHECK /GROUP/DSET_NDATA_EA
 #
-TOOLTEST h5fc_ext_none.h5 -d /GROUP/DSET_BT2
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /GROUP/DSET_BT2
 IDX_CHECK /GROUP/DSET_BT2
 #
-TOOLTEST h5fc_ext_none.h5 -d /DSET_NDATA_BT2
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /DSET_NDATA_BT2
 IDX_CHECK /DSET_NDATA_BT2
 #
-TOOLTEST h5fc_ext_none.h5 -d /DSET_FA
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /DSET_FA
 IDX_CHECK /DSET_FA
 #
-TOOLTEST h5fc_ext_none.h5 -d /GROUP/DSET_NDATA_FA
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /GROUP/DSET_NDATA_FA
 IDX_CHECK /GROUP/DSET_NDATA_FA
 #
-TOOLTEST h5fc_ext_none.h5 -d /DSET_NONE
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /DSET_NONE
 IDX_CHECK /DSET_NONE
 #
-TOOLTEST h5fc_ext_none.h5 -d /GROUP/DSET_NDATA_NONE
+TOOLTEST h5fc_ext_none.h5 $TMPCHKFILE -d /GROUP/DSET_NDATA_NONE
 IDX_CHECK /GROUP/DSET_NDATA_NONE
 #
 #
@@ -416,16 +420,16 @@ IDX_CHECK /GROUP/DSET_NDATA_NONE
 # No output from tests: just check exit code
 # h5format_convert -d /DSET_NDATA_BT2 old_h5fc_ext_none.h5 (v1-btree dataset)
 # h5format_convert -d /DSET_CONTIGUOUS h5fc_non_v3.h5 (non-chunked dataset)
-TOOLTEST old_h5fc_ext_none.h5 -d /DSET_NDATA_BT2
-TOOLTEST h5fc_non_v3.h5 -d /DSET_CONTIGUOUS
+TOOLTEST old_h5fc_ext_none.h5 $TMPFILE -d /DSET_NDATA_BT2
+TOOLTEST h5fc_non_v3.h5 $TMPFILE -d /DSET_CONTIGUOUS
 #
 #
 #
 # No output from tests: just check exit code
 # h5format_convert -d /GROUP/DSET_BT2 -n h5fc_non_v3.h5 (noop, one dataset)
 # h5format_convert -n h5fc_non_v3.h5 (noop, all datasets)
-TOOLTEST h5fc_non_v3.h5 -d /GROUP/DSET_BT2 -n
-TOOLTEST h5fc_non_v3.h5 -n
+TOOLTEST h5fc_non_v3.h5 $TMPFILE -d /GROUP/DSET_BT2 -n
+TOOLTEST h5fc_non_v3.h5 $TMPFILE -n
 #
 #
 #
@@ -433,7 +437,7 @@ TOOLTEST h5fc_non_v3.h5 -n
 # h5format_convert h5fc_non_v3.h5
 # 1) convert all datasets 
 # 2) verify indexing types
-TOOLTEST h5fc_non_v3.h5
+TOOLTEST h5fc_non_v3.h5 $TMPCHKFILE
 IDX_CHECK /DSET_NDATA_EA
 IDX_CHECK /DSET_NDATA_BT2
 IDX_CHECK /GROUP/DSET_BT2
@@ -445,47 +449,47 @@ IDX_CHECK /GROUP/DSET_EA
 # h5format_convert h5fc_edge_v3.h5
 # 1) convert the chunked dataset (filter, no-filter-edge-chunk)
 # 2) verify the indexing type
-TOOLTEST h5fc_edge_v3.h5
+TOOLTEST h5fc_edge_v3.h5 $TMPCHKFILE
 IDX_CHECK /DSET_EDGE
 #
 #
 
 # The following test files have messages in the superblock extension.
 # Verify h5dump output for correctness after conversion
-TOOLTEST h5fc_ext1_i.h5
+TOOLTEST h5fc_ext1_i.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext1_i.h5 h5fc_ext1_i.ddl
-TOOLTEST h5fc_ext1_s.h5
+TOOLTEST h5fc_ext1_s.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext1_s.h5 h5fc_ext1_s.ddl
-TOOLTEST h5fc_ext1_f.h5
+TOOLTEST h5fc_ext1_f.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext1_f.h5 h5fc_ext1_f.ddl
 #
-TOOLTEST h5fc_ext2_if.h5
+TOOLTEST h5fc_ext2_if.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext2_if.h5 h5fc_ext2_if.ddl
-TOOLTEST h5fc_ext2_is.h5
+TOOLTEST h5fc_ext2_is.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext2_is.h5 h5fc_ext2_is.ddl
-TOOLTEST h5fc_ext2_sf.h5
+TOOLTEST h5fc_ext2_sf.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext2_sf.h5 h5fc_ext2_sf.ddl
 #
-TOOLTEST h5fc_ext3_isf.h5
+TOOLTEST h5fc_ext3_isf.h5 $TMPDMPFILE
 H5DUMP_CHECK h5fc_ext3_isf.h5 h5fc_ext3_isf.ddl
 #
 #
 #
-TOOLTEST old_h5fc_ext1_i.h5
+TOOLTEST old_h5fc_ext1_i.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext1_i.h5 old_h5fc_ext1_i.ddl
-TOOLTEST old_h5fc_ext1_s.h5
+TOOLTEST old_h5fc_ext1_s.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext1_s.h5 old_h5fc_ext1_s.ddl
-TOOLTEST old_h5fc_ext1_f.h5
+TOOLTEST old_h5fc_ext1_f.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext1_f.h5 old_h5fc_ext1_f.ddl
 #
-TOOLTEST old_h5fc_ext2_if.h5
+TOOLTEST old_h5fc_ext2_if.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext2_if.h5 old_h5fc_ext2_if.ddl
-TOOLTEST old_h5fc_ext2_is.h5
+TOOLTEST old_h5fc_ext2_is.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext2_is.h5 old_h5fc_ext2_is.ddl
-TOOLTEST old_h5fc_ext2_sf.h5
+TOOLTEST old_h5fc_ext2_sf.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext2_sf.h5 old_h5fc_ext2_sf.ddl
 #
-TOOLTEST old_h5fc_ext3_isf.h5
+TOOLTEST old_h5fc_ext3_isf.h5 $TMPDMPFILE
 H5DUMP_CHECK old_h5fc_ext3_isf.h5 old_h5fc_ext3_isf.ddl
 #
 # Clean up temporary files/directories
-- 
cgit v0.12