[svn-r13793]

Clean temporary test files

Tested: linux, SunOS

Note: the files outside tools were generated by bin/reconfigure

6 files changed, 26 insertions, 20 deletions

diff --git a/configure b/configure
index 5dc27d6..67cd32e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13703 2007-04-27 14:56:33Z acheng .
+# From configure.in Id: configure.in 13716 2007-05-01 03:38:52Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta1post1.
 #
diff --git a/src/Makefile.in b/src/Makefile.in
index 6210d21..ebe4b14 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -104,8 +104,8 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5Odrvinfo.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \
 	H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo H5Omtime.lo \
 	H5Oname.lo H5Onull.lo H5Opline.lo H5Orefcount.lo H5Osdspace.lo \
-	H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo H5P.lo \
-	H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
+	H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5Ounknown.lo \
+	H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
 	H5Pfmpl.lo H5Pgcpl.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo \
 	H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo \
 	H5S.lo H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \
diff --git a/test/Makefile.in b/test/Makefile.in
index 806bea7..3c3884d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -81,12 +81,13 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	getname$(EXEEXT) vfd$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
 	dtransform$(EXEEXT) reserved$(EXEEXT) cross_read$(EXEEXT) \
 	btree2$(EXEEXT) fheap$(EXEEXT)
-am__EXEEXT_2 = gen_bogus$(EXEEXT) gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
-	gen_new_array$(EXEEXT) gen_new_fill$(EXEEXT) \
-	gen_new_group$(EXEEXT) gen_new_mtime$(EXEEXT) \
-	gen_new_super$(EXEEXT) gen_noencoder$(EXEEXT) \
-	gen_nullspace$(EXEEXT) space_overflow$(EXEEXT) \
-	gen_cross$(EXEEXT) gen_udlinks$(EXEEXT)
+am__EXEEXT_2 = gen_bogus$(EXEEXT) gen_deflate$(EXEEXT) \
+	gen_filters$(EXEEXT) gen_new_array$(EXEEXT) \
+	gen_new_fill$(EXEEXT) gen_new_group$(EXEEXT) \
+	gen_new_mtime$(EXEEXT) gen_new_super$(EXEEXT) \
+	gen_noencoder$(EXEEXT) gen_nullspace$(EXEEXT) \
+	space_overflow$(EXEEXT) gen_cross$(EXEEXT) \
+	gen_udlinks$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 big_SOURCES = big.c
 big_OBJECTS = big.$(OBJEXT)
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index 4f24735..a0fcdcc 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -52,7 +52,7 @@ testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES+=*.h5
+CHECK_CLEANFILES+=*.h5 *.bin
 DISTCLEANFILES=h5repack.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index a7cc99a..a6d37d9 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -330,7 +330,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin
 
 # Include src, test, and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 6d1feaf..6d1888c 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -74,6 +74,9 @@ const char *H5REPACK_FILENAMES[] = {
     NULL
 };
 
+#define H5REPACK_EXTFILE "h5repack_ext.bin"
+
+
 const char *progname = "h5repacktst";
 int d_status = EXIT_SUCCESS;
 
@@ -136,7 +139,6 @@ int main (void)
 #if defined (H5_HAVE_FILTER_SZIP)
  int szip_can_encode = 0;
 #endif
- hid_t       fapl;
 
  /* initialize */
  memset(&diff_options, 0, sizeof (diff_opt_t));
@@ -145,10 +147,6 @@ int main (void)
  /* run tests  */
  puts("Testing h5repack:");
 
- /* setup */
- h5_reset();
- fapl = h5_fileaccess();
-
  /* make the test files */
  TESTING("    generating datasets");
  if (make_testfiles()<0)
@@ -1305,14 +1303,21 @@ if (szip_can_encode) {
 
 
 /*-------------------------------------------------------------------------
- * end
+ * clean temporary test files
  *-------------------------------------------------------------------------
  */
+ {
+     hid_t       fapl;
+     
+     /* setup */
+     h5_reset();
+     fapl = h5_fileaccess();
+     h5_cleanup(H5REPACK_FILENAMES, fapl); 
+     
+ }
 
  puts("All h5repack tests passed.");
 
- h5_cleanup(H5REPACK_FILENAMES, fapl); 
-
  return 0;
 
 error:
@@ -2695,7 +2700,7 @@ int make_external(hid_t loc_id)
  /* create */ 
  if ((dcpl = H5Pcreate(H5P_DATASET_CREATE))<0)
   goto out;
- if (H5Pset_external(dcpl, "h5repack_ext.bin", (off_t)0, size)<0) 
+ if (H5Pset_external(dcpl, H5REPACK_EXTFILE, (off_t)0, size)<0) 
   goto out;
  if ((sid = H5Screate_simple(1,cur_size, max_size))<0)
   goto out;