diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-05-14 20:30:58 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-05-14 20:30:58 (GMT) |
| commit | c4b0bcda1253e44bfbd5a04e07e9b9a54cf88f52 (patch) | |
| tree | 40145ad30f306dbff8892e1b83b8bf0a9da40dc7 | |
| parent | 9635cdc24f31a557923d1b789f835fe563533e5f (diff) | |
| download | hdf5-c4b0bcda1253e44bfbd5a04e07e9b9a54cf88f52.zip hdf5-c4b0bcda1253e44bfbd5a04e07e9b9a54cf88f52.tar.gz hdf5-c4b0bcda1253e44bfbd5a04e07e9b9a54cf88f52.tar.bz2 | |
[svn-r18809] Purpose:
Fixed file cleanup during make distclean / make check.
Description:
The h5jam Makefile and the h5importtestutil.sh script both included cleanup
steps that removed "*.txt" from the directory. This resulted in the new
CMake specific configuration file, CMakeLists.txt, getting blown away by
make distclean (for h5jam) and make check (for h5import).
I've removed the *.txt from the h5jam Makefile as the directory looks to be
getting cleaned appropriately without it, and I've modified the h5import
script h5importtestutil.sh to point to the specific .txt files to clean.
Tested:
jam
| -rwxr-xr-x | tools/h5import/h5importtestutil.sh | 2 | ||||
| -rw-r--r-- | tools/h5jam/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5jam/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh index 9ec8e15..d558eba 100755 --- a/tools/h5import/h5importtestutil.sh +++ b/tools/h5import/h5importtestutil.sh @@ -108,7 +108,7 @@ TOOLTEST $srcdir/testfiles/str.txt -c $srcdir/testfiles/textstr.conf -o test14.h TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " TOOLTEST $srcdir/testfiles/in64.txt -c $srcdir/testfiles/textpfe.conf -o test15.h5 -rm -f *.txt *.bin *.h5 +rm -f txtin32.txt txtin16.txt *.bin *.h5 rm -rf tmp_testfiles else echo "** h5import or h5importtest not available ***" diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am index 2f9bc00..c6ccebf 100644 --- a/tools/h5jam/Makefile.am +++ b/tools/h5jam/Makefile.am @@ -39,7 +39,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5) # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES+=*.h5 *.txt +CHECK_CLEANFILES+=*.h5 DISTCLEANFILES=testh5jam.sh include $(top_srcdir)/config/conclude.am diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 20bedf4..696e53a 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -374,7 +374,7 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.txt +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib |