[svn-r21113] Description:

Revert the previous makefile change as release snapshot test failed with
    MANIFEST check. Don't clean 'testfiles' dir via 'make distclean' for 
    the case of build&test in source dir. 
    In regular daily testings, we build&test in seperate dir from source dir, 
    so no issues occurred. 
    However for the release snapshot test, it seems that we build&test in 
    source dir.
    The previous change can remove testfiles in source dir if build&test is 
    done in source dir becasue currently the dir name 'testfiles' is same in
    source dir and test dir. 
    Other task (7602) may change to use different name for the test directory,
    so 'make distclean' can do its job without interrupting MANIFEST.
This commit is contained in:
Jonathan Kim 2011-07-18 11:13:34 -05:00
parent b76b1e060a
commit cc0486926f
2 changed files with 3 additions and 3 deletions

View File

@ -55,7 +55,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# Temporary files. *.h5 are generated by h5diff. They should
# be copied to the testfiles/ directory if update is required
CHECK_CLEANFILES+=*.h5 testfiles expect_sorted actual_sorted
CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted
include $(top_srcdir)/config/conclude.am

View File

@ -403,8 +403,8 @@ TRACE = perl $(top_srcdir)/bin/trace
# Temporary files. *.h5 are generated by h5diff. They should
# be copied to the testfiles/ directory if update is required
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 testfiles \
expect_sorted actual_sorted
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \
actual_sorted
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib