[svn-r23430] prevent make check from running test client and sever

update install EFF

4 files changed, 45 insertions, 54 deletions

diff --git a/EFF_INSTALL b/EFF_INSTALL
index 0b85d78..3657cdb 100644
--- a/EFF_INSTALL
+++ b/EFF_INSTALL
@@ -1,19 +1,21 @@
 System pre-requisites: 
-	An MPI implementation that supports MPI_THREAD_MULTIPLE
+	An MPI3 implementation that supports MPI_THREAD_MULTIPLE
+            [i.e. MPICH3 or later - we built with MPICH 3.0.2]
 	Pthreads
 
+
 build opa:
-	It is located in the tarball in the 'openpa' directory, OR get it
+	It is located in the tarball in the 'openpa' subdirectory, OR get it
         from here: git clone git://git.mcs.anl.gov/radix/openpa.git
 
-	./autogen.sh
 	./configure --prefix=/path/to/opa/install/directory
 	make
         make check
 	make install
 
+
 build AXE:
-	It is located in the tarball in the 'axe' directory, OR get it from
+	It is located in the tarball in the 'axe' subdirectory, OR get it from
         here: svn checkout https://svn.hdfgroup.uiuc.edu/axe/trunk
 
 	./configure --prefix=/path/to/axe/install/directory --with-opa=/path/to/opa/install/directory
@@ -21,34 +23,43 @@ build AXE:
         make check
 	make install
 
+
 build Skeletal IOD:
-	It is located in the tarball in the 'iod' directory, OR get the
+	It is located in the tarball in the 'iod' subdirectory, OR get the
         tarball from the FastForward Wiki here:
         https://wiki.hpdd.intel.com/download/attachments/12125118/iod-skeleton.tgz?api=v2
 
-	cp the iodrc file from the iod top level directory to /etc/iodrc
+	Copy the 'iodrc' file from the top level iod directory to /etc/iodrc or
+        the top-level build directory for HDF5 (e.g. hdf5_ff, if you are
+        building "in-place" from the tarball).
+
 	make
 
-	Note the path to the IOD install is actually just the path to the top
-        source directory where you unpacked the tar file.
+	Note the path to the IOD install (for the HDF5 build, below) is
+        actually just the path to the top source directory where you build
+        IOD (i.e. /path/to/your/copy/of/fastforward/iod).
+
 
 build iofsl function shipper
-	The code is located in tarball in the 'iofsl-shipper-*' directory.
+	The code is located in tarball in the 'iofsl' subdirectory.
+
+	Refer to Jerome's IOFSL build recipe in that subdirectory for build
+        instructions.
 
-	refer to Jerome's IOFSL build recipe
 
 build HDF5 IOD VOL plugin:
-        The code is located in the tarball, in the top source directory where
-        the tar file was unpacked, OR get it from here:
+        The code is located in the tarball in the 'hdf5_ff' subdirectory, OR
+        get it from here:
             svn checkout http://svn.hdfgroup.uiuc.edu/hdf5/features/iod
 
-	./configure --with-iod=/path/to/iod/install/directory --with-axe=/path/to/axe/install/directory --with-shipper=/path/to/iofsl-shipper/install/directory --enable-parallel --enable-debug --enable-trace --enable-threadsafe --enable-unsupported --with-pthread=/path/to/pthread_library
+	./configure --with-iod=/path/to/iod/install/directory --with-axe=/path/to/axe/install/directory --with-shipper=/path/to/iofsl-shipper/install/directory --enable-parallel --enable-debug --enable-threadsafe --enable-unsupported --with-pthread
 	make
         make check
 	make install
 
-The tests are located in testpar/test_client.c and testpar/test_server.c.  The
-build process should generate the executables.  The client and server need to
+
+The examples are located in testpar/test_client.c and testpar/test_server.c.  The
+HDF5 build process should generate the executables.  The client and server need to
 be launched from the same directory for now.
 
 Launch the server first:
diff --git a/src/H5VLiod.c b/src/H5VLiod.c
index 503cf95..d939d08 100644
--- a/src/H5VLiod.c
+++ b/src/H5VLiod.c
@@ -1941,6 +1941,7 @@ H5VL_iod_dataset_read(void *_dset, hid_t mem_type_id, hid_t mem_space_id,
     input.iod_oh = dset->remote_dset.iod_oh;
     input.scratch_oh = dset->remote_dset.scratch_oh;
     input.bds_handle = *bds_handle;
+    input.checksum = 0;
     input.dxpl_id = dxpl_id;
     input.space_id = file_space_id;
 
@@ -2053,17 +2054,6 @@ H5VL_iod_dataset_write(void *_dset, hid_t mem_type_id, hid_t mem_space_id,
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(NULL != dset->common.request && H5VL_IOD_PENDING == dset->common.request->state) {
-        if(H5VL_iod_request_wait(dset->common.file, dset->common.request) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't wait on FS request");
-
-        /* Reset object's pointer to request */
-        /* (Request is owned by the request object and will be freed when the
-         *      application calls test or wait on it.)
-         */
-        dset->common.request = NULL;
-    }
-
     /* check arguments */
     if(H5S_ALL != mem_space_id) {
 	if(NULL == (mem_space = (const H5S_t *)H5I_object_verify(mem_space_id, H5I_DATASPACE)))
@@ -2092,6 +2082,17 @@ H5VL_iod_dataset_write(void *_dset, hid_t mem_type_id, hid_t mem_space_id,
     if(!buf)
         buf = &fake_char;
 
+    if(NULL != dset->common.request && H5VL_IOD_PENDING == dset->common.request->state) {
+        if(H5VL_iod_request_wait(dset->common.file, dset->common.request) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't wait on FS request");
+
+        /* Reset object's pointer to request */
+        /* (Request is owned by the request object and will be freed when the
+         *      application calls test or wait on it.)
+         */
+        dset->common.request = NULL;
+    }
+
     /* calculate the size of the buffer needed - MSC we are assuming everything is contiguous now */
     size = H5Sget_simple_extent_npoints(mem_space_id) *  H5Tget_size(mem_type_id);
 
diff --git a/testpar/Makefile.am b/testpar/Makefile.am
index 4422c4a..86d069f 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -25,7 +25,8 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test
 
 # Test programs and scripts.  These are our main targets.
 #
-TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame test_server test_client
+TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame
+BUILD_ALL_PROGS=test_server test_client
 TEST_SCRIPT_PARA=testph5.sh
 
 check_PROGRAMS = $(TEST_PROG_PARA)
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index d2a2d8e..a110573 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -85,8 +85,7 @@ CONFIG_CLEAN_FILES = testph5.sh
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = t_mpi$(EXEEXT) t_posix_compliant$(EXEEXT) \
 	testphdf5$(EXEEXT) t_cache$(EXEEXT) t_pflush1$(EXEEXT) \
-	t_pflush2$(EXEEXT) t_shapesame$(EXEEXT) test_server$(EXEEXT) \
-	test_client$(EXEEXT)
+	t_pflush2$(EXEEXT) t_shapesame$(EXEEXT)
 t_cache_SOURCES = t_cache.c
 t_cache_OBJECTS = t_cache.$(OBJEXT)
 t_cache_LDADD = $(LDADD)
@@ -123,18 +122,6 @@ t_shapesame_LDADD = $(LDADD)
 t_shapesame_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-test_client_SOURCES = test_client.c
-test_client_OBJECTS = test_client.$(OBJEXT)
-test_client_LDADD = $(LDADD)
-test_client_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-test_server_SOURCES = test_server.c
-test_server_OBJECTS = test_server.$(OBJEXT)
-test_server_LDADD = $(LDADD)
-test_server_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
 am_testphdf5_OBJECTS = testphdf5.$(OBJEXT) t_dset.$(OBJEXT) \
 	t_file.$(OBJEXT) t_file_image.$(OBJEXT) t_mdset.$(OBJEXT) \
 	t_ph5basic.$(OBJEXT) t_coll_chunk.$(OBJEXT) \
@@ -171,11 +158,9 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c \
-	t_posix_compliant.c t_shapesame.c test_client.c test_server.c \
-	$(testphdf5_SOURCES)
+	t_posix_compliant.c t_shapesame.c $(testphdf5_SOURCES)
 DIST_SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c \
-	t_posix_compliant.c t_shapesame.c test_client.c test_server.c \
-	$(testphdf5_SOURCES)
+	t_posix_compliant.c t_shapesame.c $(testphdf5_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -479,7 +464,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
 
 # Test programs and scripts.  These are our main targets.
 #
-TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame test_server test_client
+TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame
+BUILD_ALL_PROGS = test_server test_client
 TEST_SCRIPT_PARA = testph5.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \
@@ -574,12 +560,6 @@ t_posix_compliant$(EXEEXT): $(t_posix_compliant_OBJECTS) $(t_posix_compliant_DEP
 t_shapesame$(EXEEXT): $(t_shapesame_OBJECTS) $(t_shapesame_DEPENDENCIES) $(EXTRA_t_shapesame_DEPENDENCIES) 
 	@rm -f t_shapesame$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_shapesame_OBJECTS) $(t_shapesame_LDADD) $(LIBS)
-test_client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES) $(EXTRA_test_client_DEPENDENCIES) 
-	@rm -f test_client$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_client_OBJECTS) $(test_client_LDADD) $(LIBS)
-test_server$(EXEEXT): $(test_server_OBJECTS) $(test_server_DEPENDENCIES) $(EXTRA_test_server_DEPENDENCIES) 
-	@rm -f test_server$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_server_OBJECTS) $(test_server_LDADD) $(LIBS)
 testphdf5$(EXEEXT): $(testphdf5_OBJECTS) $(testphdf5_DEPENDENCIES) $(EXTRA_testphdf5_DEPENDENCIES) 
 	@rm -f testphdf5$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testphdf5_OBJECTS) $(testphdf5_LDADD) $(LIBS)
@@ -606,8 +586,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_prop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_shapesame.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_span_tree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testphdf5.Po@am__quote@
 
 .c.o: