summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2011-07-18 16:43:18 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2011-07-18 16:43:18 (GMT)
commit28b4826a812c193b94b8d43b91fb3048d97d2eb5 (patch)
tree56ecc472eabe62daefd38742984bfcac6066de77
parent6c0f470d9dc4cc1d5e75687fef7245aa2d2fd0c6 (diff)
downloadhdf5-28b4826a812c193b94b8d43b91fb3048d97d2eb5.zip
hdf5-28b4826a812c193b94b8d43b91fb3048d97d2eb5.tar.gz
hdf5-28b4826a812c193b94b8d43b91fb3048d97d2eb5.tar.bz2
[svn-r21114] 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 need to change to use different name for the test directory, so 'make distclean' can do its job without interrupting MANIFEST.
-rw-r--r--tools/h5diff/Makefile.am2
-rw-r--r--tools/h5diff/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index da4464b..0b8816f 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -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
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 196f2cd..55d7802 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -403,7 +403,7 @@ 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 \
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \
actual_sorted
# Include src and tools/lib directories