diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-07-18 16:13:34 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-07-18 16:13:34 (GMT) |
| commit | cc0486926f52a25a252f560d35fba7d4cf73f521 (patch) | |
| tree | 7b6e5c4d896ee691655b3c5003b2286837045391 | |
| parent | b76b1e060a18f68b58f2f021969784de8bbe7dff (diff) | |
| download | hdf5-cc0486926f52a25a252f560d35fba7d4cf73f521.zip hdf5-cc0486926f52a25a252f560d35fba7d4cf73f521.tar.gz hdf5-cc0486926f52a25a252f560d35fba7d4cf73f521.tar.bz2 | |
[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.
| -rw-r--r-- | tools/h5diff/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 4 |
2 files changed, 3 insertions, 3 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 02011a7..55d7802 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -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 |