mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9929] Purpose:

Browse Source 
Features

Description:
Added the option to build ph5diff and run testphdf5.sh when
parallel mode is enabled.

Platforms tested:
tested in heping, both serial and parallel.

Misc. update:
This commit is contained in:
Albert Cheng 2005-02-03 16:03:24 -05:00
parent 0b332ace5e
commit 5186398930
2 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/h5diff/Makefile.am
View File

@ -22,12 +22,23 @@ include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.
if BUILD_PARALLEL_CONDITIONAL
H5PDIFF=ph5diff
H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
else
H5PDIFF=
H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh
endif
# Our main target, h5diff
bin_PROGRAMS=h5diff
bin_SCRIPTS=$(H5PDIFF)
# Test programs and scripts
TEST_PROG=h5difftst
TEST_SCRIPT=$(srcdir)/testh5diff.sh
TEST_SCRIPT=$(H5DIFF_SCRIPT)
check_PROGRAMS=$(TEST_PROG)
check_SCRIPTS=$(TEST_SCRIPT)
@ -44,5 +55,8 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# be copied to the testfiles/ directory if update is required
MOSTLYCLEANFILES=*.h5
ph5diff: h5diff
@$(CP) $? $@
include $(top_srcdir)/config/conclude.am

59
tools/h5diff/Makefile.in
View File

@ -203,12 +203,20 @@ F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.
@BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff
@BUILD_PARALLEL_CONDITIONAL_FALSE@H5PDIFF =
@BUILD_PARALLEL_CONDITIONAL_TRUE@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
@BUILD_PARALLEL_CONDITIONAL_FALSE@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh
# Our main target, h5diff
bin_PROGRAMS = h5diff
bin_SCRIPTS = $(H5PDIFF)
# Test programs and scripts
TEST_PROG = h5difftst
TEST_SCRIPT = $(srcdir)/testh5diff.sh
TEST_SCRIPT = $(H5DIFF_SCRIPT)
check_PROGRAMS = $(TEST_PROG)
check_SCRIPTS = $(TEST_SCRIPT)
@ -260,6 +268,8 @@ h5difftst_LDADD = $(LDADD)
h5difftst_DEPENDENCIES = $(top_builddir)/tools/lib/libh5tools.la \
$(top_builddir)/src/libhdf5.la
h5difftst_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
@ -291,7 +301,7 @@ all: all-am
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu tools/h5diff/Makefile
$(AUTOMAKE) --foreign tools/h5diff/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@ -336,6 +346,26 @@ h5diff$(EXEEXT): $(h5diff_OBJECTS) $(h5diff_DEPENDENCIES)
h5difftst$(EXEEXT): $(h5difftst_OBJECTS) $(h5difftst_DEPENDENCIES)
@rm -f h5difftst$(EXEEXT)
$(LINK) $(h5difftst_LDFLAGS) $(h5difftst_OBJECTS) $(h5difftst_LDADD) $(LIBS)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
$(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@ -447,10 +477,10 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(PROGRAMS) all-local
all-am: Makefile $(PROGRAMS) $(SCRIPTS) all-local
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
install: install-am
install-exec: install-exec-am
@ -497,7 +527,7 @@ info-am:
install-data-am:
install-exec-am: install-binPROGRAMS
install-exec-am: install-binPROGRAMS install-binSCRIPTS
install-info: install-info-am
@ -514,21 +544,26 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-info-am
.PHONY: GTAGS all all-am all-local check check-TESTS check-am clean \
clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
clean-libtool distclean distclean-compile distclean-depend \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-info-am
install-binSCRIPTS install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-binSCRIPTS uninstall-info-am
ph5diff: h5diff
@$(CP) $? $@
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
build-lib: $(LIB)