summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-08-31 20:20:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-08-31 20:20:12 (GMT)
commitc9cf76d5f9abff08e2488b79825551e99adecf42 (patch)
tree378c8c9f261dd362fe07aac3329eefab3122be72 /testpar
parent0792a4dd4c5dc399ed4a99c799e999d9e944b5ba (diff)
downloadhdf5-c9cf76d5f9abff08e2488b79825551e99adecf42.zip
hdf5-c9cf76d5f9abff08e2488b79825551e99adecf42.tar.gz
hdf5-c9cf76d5f9abff08e2488b79825551e99adecf42.tar.bz2
[svn-r19326] Added parallel build commands.
Corrected use/name of source folder aliases. Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work). Bring r19325 from trunk Tested: local linux with mpich
Diffstat (limited to 'testpar')
-rw-r--r--testpar/CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 0eac602..05e0ced 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -1,6 +1,8 @@
cmake_minimum_required (VERSION 2.8)
-PROJECT (H5_TEST_PAR)
+PROJECT (HDF5_TEST_PAR)
+INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
#-----------------------------------------------------------------------------
# Define Tests
#-----------------------------------------------------------------------------
@@ -15,6 +17,7 @@ SET (testphdf5_SRCS
${HDF5_TEST_PAR_SOURCE_DIR}/t_span_tree.c
${HDF5_TEST_PAR_SOURCE_DIR}/t_chunk_alloc.c
${HDF5_TEST_PAR_SOURCE_DIR}/t_filter_read.c
+ ${HDF5_TEST_PAR_SOURCE_DIR}/t_rank_projection.c
)
#-- Adding test for testhdf5
@@ -32,7 +35,7 @@ IF (WIN32)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
-ADD_TEST (NAME testphdf5 COMMAND $<TARGET_FILE:testphdf5>)
+ADD_TEST (NAME testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>)
MACRO (ADD_H5P_TEST file)
ADD_EXECUTABLE (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
@@ -49,7 +52,7 @@ MACRO (ADD_H5P_TEST file)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
- ADD_TEST (NAME ${file} COMMAND $<TARGET_FILE:${file}>)
+ ADD_TEST (NAME ${file} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${file}>)
ENDMACRO (ADD_H5P_TEST file)
SET (H5P_TESTS