[svn-r18808] 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
This commit is contained in:
Mike McGreevy 2010-05-14 15:29:57 -05:00
parent ed4885a485
commit 88de0e02f0
3 changed files with 3 additions and 3 deletions

View File

@ -120,7 +120,7 @@ TOOLTEST $srcdir/testfiles/in64.txt -c $srcdir/testfiles/textpfe.conf -o test15.
rm -f *.txt *.bin *.h5
rm -f txtin32.txt txtin16.txt *.bin *.h5
rm -rf tmp_testfiles
else
echo "** h5import or h5importtest not available ***"

View File

@ -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

View File

@ -373,7 +373,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