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

[svn-r10850] Purpose:

Browse Source 
Improvement.

Description:
assign testph5diff.sh to the Parallel test scripts so that
it will be tested for the check-p target.

Platforms tested:
heping pp.

Misc. update:
This commit is contained in:
Albert Cheng 2005-06-02 22:46:44 -05:00
parent a2217d58c8
commit 1567902262
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/h5diff/Makefile.am
View File

@ -26,10 +26,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# is enabled.
if BUILD_PARALLEL_CONDITIONAL
H5PDIFF=ph5diff
H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
else
H5PDIFF=
H5DIFF_SCRIPT=$(srcdir)/testh5diff.sh
TEST_SCRIPT_PARA=$(srcdir)/testph5diff.sh
endif
# Our main target, h5diff
@ -37,10 +34,10 @@ bin_PROGRAMS=h5diff $(H5PDIFF)
# Test programs and scripts
TEST_PROG=h5difftst
TEST_SCRIPT=$(H5DIFF_SCRIPT)
TEST_SCRIPT=$(srcdir)/testh5diff.sh
check_PROGRAMS=$(TEST_PROG)
check_SCRIPTS=$(TEST_SCRIPT)
check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
# Source files for the program
h5diff_SOURCES=h5diff_main.c h5diff_common.c

8
tools/h5diff/Makefile.in
View File

@ -314,18 +314,16 @@ H5FC_PP = $(bindir)/h5pfc
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_FALSE@H5PDIFF =
# 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@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh
@BUILD_PARALLEL_CONDITIONAL_TRUE@H5DIFF_SCRIPT = $(srcdir)/testh5diff.sh $(srcdir)/testph5diff.sh
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = $(srcdir)/testph5diff.sh
# Test programs and scripts
TEST_PROG = h5difftst
TEST_SCRIPT = $(H5DIFF_SCRIPT)
check_SCRIPTS = $(TEST_SCRIPT)
TEST_SCRIPT = $(srcdir)/testh5diff.sh
check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
# Source files for the program
h5diff_SOURCES = h5diff_main.c h5diff_common.c