From 90067b76ce50b070b4792bc1fe8ca3c79b2e8588 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Wed, 25 Feb 2015 13:52:27 -0500 Subject: [svn-r26304] bring 26303 from trunk: remove files with .clog2 extension generated by MPE when doing make clean --- Makefile.in | 4 ++-- c++/Makefile.in | 4 ++-- c++/examples/Makefile.in | 4 ++-- c++/src/Makefile.in | 4 ++-- c++/test/Makefile.in | 6 +++--- config/commence.am | 4 ++-- examples/Makefile.in | 5 +++-- fortran/Makefile.in | 4 ++-- fortran/examples/Makefile.in | 4 ++-- fortran/src/Makefile.in | 4 ++-- fortran/test/Makefile.in | 4 ++-- fortran/testpar/Makefile.in | 4 ++-- hl/Makefile.in | 4 ++-- hl/c++/Makefile.in | 4 ++-- hl/c++/examples/Makefile.in | 4 ++-- hl/c++/src/Makefile.in | 4 ++-- hl/c++/test/Makefile.in | 4 ++-- hl/examples/Makefile.in | 4 ++-- hl/fortran/Makefile.in | 4 ++-- hl/fortran/examples/Makefile.in | 4 ++-- hl/fortran/src/Makefile.in | 4 ++-- hl/fortran/test/Makefile.in | 6 +++--- hl/src/Makefile.in | 4 ++-- hl/test/Makefile.in | 12 ++++++------ hl/tools/Makefile.in | 4 ++-- hl/tools/gif2h5/Makefile.in | 4 ++-- src/Makefile.in | 4 ++-- test/Makefile.in | 6 +++--- testpar/Makefile.in | 6 +++--- tools/Makefile.in | 4 ++-- tools/h5copy/Makefile.in | 4 ++-- tools/h5diff/Makefile.in | 4 ++-- tools/h5dump/Makefile.in | 4 ++-- tools/h5import/Makefile.in | 4 ++-- tools/h5jam/Makefile.in | 6 +++--- tools/h5ls/Makefile.in | 4 ++-- tools/h5repack/Makefile.in | 4 ++-- tools/h5stat/Makefile.in | 4 ++-- tools/lib/Makefile.in | 4 ++-- tools/misc/Makefile.in | 4 ++-- tools/perform/Makefile.in | 4 ++-- 41 files changed, 92 insertions(+), 91 deletions(-) diff --git a/Makefile.in b/Makefile.in index a47b9d9..40e459a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -500,10 +500,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Some files/directories generated during check that should be cleaned -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *-tmp @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = # Define subdirectories to build. diff --git a/c++/Makefile.in b/c++/Makefile.in index e5aa783..de07e85 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -660,8 +660,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 773f842..c839405 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 INSTALL_SCRIPT_FILES = run-c++-ex.sh # These are the programs that 'make all' or 'make prog' will build and diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 136c3a5..e57931e 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -674,8 +674,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index c8edd4d..bd1ba95 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -665,10 +665,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog tattr_multi.h5 tfattrs.h5 \ - tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 tattr_multi.h5 \ + tfattrs.h5 tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \ tattr_basic.h5 # These are our main targets. They should be listed in the order to be diff --git a/config/commence.am b/config/commence.am index 4bc005e..554c9fb 100644 --- a/config/commence.am +++ b/config/commence.am @@ -89,8 +89,8 @@ F9XMODFLAG=@F9XMODFLAG@ # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES=*.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2 # List all build rules defined by HDF5 Makefiles as "PHONY" targets here. # This tells the Makefiles that these targets are not files to be built but diff --git a/examples/Makefile.in b/examples/Makefile.in index 8209e3f..e62666f 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -608,8 +608,9 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog $(EXTLINK_DIRS) *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 $(EXTLINK_DIRS) \ + *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example INSTALL_SCRIPT_FILES = run-c-ex.sh INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 1bc48c0..33b09f8 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -664,8 +664,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar # Subdirectories in build order, not including examples directory diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index b6998e6..898367d 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -616,8 +616,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Compile parallel fortran examples only if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 02b9fa1..29cc2c6 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -725,8 +725,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 2140faa..f4cab39 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -734,10 +734,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.raw +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.raw # The Fortran test library noinst_LTLIBRARIES = libh5test_fortran.la diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 18d64bf..98f8c8f 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -660,10 +660,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog parf[12].h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 parf[12].h5 # These are our main targets TEST_PROG_PARA = parallel_test diff --git a/hl/Makefile.in b/hl/Makefile.in index bb7e708..4da5763 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -664,8 +664,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++ @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test tools $(CXX_DIR) $(FORTRAN_DIR) diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index c473865..99c0bc4 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -660,8 +660,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index a538c23..aa97451 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -607,8 +607,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # These are the programs that 'make all' or 'make prog' will build and # which 'make check' will run. List them in the order they should be run. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 664086f..569747e 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -666,8 +666,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index f5f2b9b..9f8ae74 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -663,8 +663,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 005ef91..ba7b3d8 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -607,8 +607,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = # Example directory diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 3578877..cb666cf 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -664,8 +664,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index ff614a8..cd3461a 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -607,8 +607,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Compile parallel fortran examples only if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 74feca2..77dca7a 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -681,8 +681,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index ff2ecdc..116c188 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -672,11 +672,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-5].h5 f1img.h5 \ - f1tab.h5 tstds.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 dsetf[1-5].h5 \ + f1img.h5 f1tab.h5 tstds.h5 # Our main target, the test programs TEST_PROG = tstds tstlite tstimage tsttable diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 1ad3c1a..1bf4756 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -662,8 +662,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index e329566..55973ac 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -699,14 +699,14 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. These files are the ones created by running `make test'. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog combine_tables[1-2].h5 \ - test_ds[1-9].h5 test_ds10.h5 test_image[1-3].h5 \ - file_img[1-2].h5 test_lite[1-4].h5 test_table.h5 \ - test_packet_table.h5 test_packet_compress.h5 test_detach.h5 \ - test_dectris.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 \ + combine_tables[1-2].h5 test_ds[1-9].h5 test_ds10.h5 \ + test_image[1-3].h5 file_img[1-2].h5 test_lite[1-4].h5 \ + test_table.h5 test_packet_table.h5 test_packet_compress.h5 \ + test_detach.h5 test_dectris.h5 # The tests depend on the hdf5, hdf5 test, and hdf5_hl libraries LDADD = $(LIBH5_HL) $(LIBH5TEST) $(LIBHDF5) diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 7f60940e..7ba2f95 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # All subdirectories SUBDIRS = gif2h5 diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index aedefdd..77baf09 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -675,8 +675,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.gif +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.gif # These are our main targets, the tools TEST_SCRIPT = h52giftest.sh diff --git a/src/Makefile.in b/src/Makefile.in index a57646c..47d9330 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -720,8 +720,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/test/Makefile.in b/test/Makefile.in index 0bee69f..03a35fe 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1030,15 +1030,15 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. These files are the ones created by setting the # HDF5_NOCLEANUP environment variable and running `make test' without # specifying a file prefix or low-level driver. Changing the file # prefix or low-level driver with environment variables will influence # the temporary file name in ways that the makefile is not aware of. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog accum.h5 cmpd_dset.h5 \ - compact_dataset.h5 dataset.h5 dset_offset.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 accum.h5 \ + cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offset.h5 \ max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \ huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_expand.h5 \ copy_dcpl_newfile.h5 extend.h5 istore.h5 extlinks*.h5 \ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 211bafe..a7c3c1b 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -690,15 +690,15 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf # shutdown.h5 is from t_pshutdown # go is used for debugging. See testphdf5.c. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog MPItest.h5 Para*.h5 \ - CacheTestDummy.h5 shutdown.h5 go +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \ + Para*.h5 CacheTestDummy.h5 shutdown.h5 go # Test programs. These are our main targets. # diff --git a/tools/Makefile.in b/tools/Makefile.in index 466294c..1ee7858 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 CONFIG = ordered # All subdirectories diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 6248394..751a968 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -669,11 +669,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Test programs and scripts TEST_PROG = h5copygentest diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 4ec41af..4e93b2b 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -676,11 +676,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # 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 expect_sorted \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ actual_sorted # Always build and test h5diff but build and test ph5diff only if parallel diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index f5689e6..a88bdf3 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -675,11 +675,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin # Test programs and scripts TEST_PROG = h5dumpgentest diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index a611304..c1b1d09 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -669,10 +669,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files from h5importtest -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.bin +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.bin # Test programs and scripts TEST_PROG = h5importtest diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 5aa68c6..959503a 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -681,12 +681,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 testfiles/h5jam-*-sav \ - testfiles/h5unjam-*-sav +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ + testfiles/h5jam-*-sav testfiles/h5unjam-*-sav TEST_SCRIPT = testh5jam.sh # Add h5jam and h5unjam specific linker flags here diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index f3be33e..4d890b1 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Test programs and scripts TEST_SCRIPT = testh5ls.sh diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 441df41..6625ef4 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -693,11 +693,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repack. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin \ testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5 # Test programs and scripts diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index c78e95b..600de79 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -671,12 +671,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 #test script and program diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index bfc73ec..40bace4 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -658,8 +658,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # This is our main target, the h5tools library. noinst_LTLIBRARIES = libh5tools.la diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 99da78f..5726b93 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -696,12 +696,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 #test script and program diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in index 50930e0..f33c285 100644 --- a/tools/perform/Makefile.in +++ b/tools/perform/Makefile.in @@ -700,8 +700,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add h5perf and h5perf_serial specific linker flags here h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) -- cgit v0.12