summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2002-01-29 16:09:50 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2002-01-29 16:09:50 (GMT)
commitc7c076e747674128f44396fb3d10565bc4218efc (patch)
treefe693983fafb3236342be174335ba6d7a42a5d3b
parent1eac2519bc1d91af7d5151b4cbe62dbf58b24952 (diff)
downloadhdf5-c7c076e747674128f44396fb3d10565bc4218efc.zip
hdf5-c7c076e747674128f44396fb3d10565bc4218efc.tar.gz
hdf5-c7c076e747674128f44396fb3d10565bc4218efc.tar.bz2
[svn-r4879] Purpose:
Bug fix Description: $TEST_PROG_PARA was included in the serial tests. $TEST_PROG_PARA was not dependent on $LIBHDF5 (it should.) Solution: Adjusted the file to fix both problems. Platforms tested: eirene (pp, linux 2.2.), dangermouse (pp, linux 2.4) modi4 (pp, -64) and modi4 serial (to verify that ph5example was not tested at all.)
-rw-r--r--examples/Makefile.in5
-rw-r--r--examples/ph5example.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 2dd7c3b..8010245 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -20,8 +20,7 @@ LIBHDF5=../src/libhdf5.la
## `make check' will run. List them in the order they should be run.
TEST_PROGS_PARA=ph5example
TEST_PROGS=h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
- h5_group h5_select h5_attribute h5_mount h5_reference \
- h5_drivers $(TEST_PROGS_PARA)
+ h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers
## These are the files that `make clean' (and derivatives) will remove from
## this directory.
@@ -39,7 +38,7 @@ TEST_OBJ=$(TEST_SRC:.c=.lo)
EXAMPLE_PROGS=$(TEST_SRC)
## How to build the programs... they all depend on the hdf5 library
-$(TEST_PROGS): $(LIBHDF5)
+$(TEST_PROGS) $(TEST_PROGS_PARA): $(LIBHDF5)
h5_chunk_read: h5_chunk_read.lo
@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_chunk_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
diff --git a/examples/ph5example.c b/examples/ph5example.c
index 84f5ab7..4871ee7 100644
--- a/examples/ph5example.c
+++ b/examples/ph5example.c
@@ -14,7 +14,7 @@
*/
#include <assert.h>
-#include <hdf5.h>
+#include "hdf5.h"
#ifdef H5_HAVE_PARALLEL
/* Temporary source code */
@@ -952,7 +952,7 @@ parse_options(int argc, char **argv){
int
main(int argc, char **argv)
{
- char *filenames[]={ "ParaEg1.h5f", "ParaEg2.h5f" };
+ char *filenames[]={ "ParaEg1.h5", "ParaEg2.h5" };
int mpi_namelen;
char mpi_name[MPI_MAX_PROCESSOR_NAME];