Commit 382dbb8e authored by Burlen Loring's avatar Burlen Loring Committed by SENSEI SC18 VM

fix tests for OpenMPI

openmpi detects when the full path to mpiexec is used and sets path and
ld library path. this can cause problems with visit because it puts
system python packages preemptively in the path overriding visit's install
parent 769d705c
...@@ -5,8 +5,8 @@ if (BUILD_TESTING) ...@@ -5,8 +5,8 @@ if (BUILD_TESTING)
SOURCES testHistogram.cpp LIBS sensei) SOURCES testHistogram.cpp LIBS sensei)
senseiAddTest(testHistogramParallel senseiAddTest(testHistogramParallel
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} testHistogram) ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} testHistogram)
senseiAddTest(testADIOSFlexpath senseiAddTest(testADIOSFlexpath
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testADIOS.sh COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testADIOS.sh
...@@ -23,12 +23,14 @@ if (BUILD_TESTING) ...@@ -23,12 +23,14 @@ if (BUILD_TESTING)
FEATURES ${ENABLE_PYTHON} ${ENABLE_ADIOS}) FEATURES ${ENABLE_PYTHON} ${ENABLE_ADIOS})
senseiAddTest(testProgrammableDataAdaptor senseiAddTest(testProgrammableDataAdaptor
COMMAND ${MPIEXEC} -np 1 testProgrammableDataAdaptor COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 1
${MPIEXEC_POSTFLAGS} testProgrammableDataAdaptor
SOURCES testProgrammableDataAdaptor.cpp SOURCES testProgrammableDataAdaptor.cpp
LIBS sensei) LIBS sensei)
senseiAddTest(testProgrammableDataAdaptorPy senseiAddTest(testProgrammableDataAdaptorPy
COMMAND ${MPIEXEC} -np 1 python COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 1
${MPIEXEC_POSTFLAGS} python
${CMAKE_CURRENT_SOURCE_DIR}/testProgrammableDataAdaptor.py ${CMAKE_CURRENT_SOURCE_DIR}/testProgrammableDataAdaptor.py
FEATURES ${ENABLE_PYTHON}) FEATURES ${ENABLE_PYTHON})
...@@ -39,7 +41,7 @@ if (BUILD_TESTING) ...@@ -39,7 +41,7 @@ if (BUILD_TESTING)
LIBS sensei) LIBS sensei)
senseiAddTest(testPythonAnalysisParallel senseiAddTest(testPythonAnalysisParallel
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} testPythonAnalysis ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} testPythonAnalysis
${CMAKE_CURRENT_SOURCE_DIR}/testPythonAnalysis.xml) ${CMAKE_CURRENT_SOURCE_DIR}/testPythonAnalysis.xml)
endif() endif()
...@@ -6,7 +6,7 @@ then ...@@ -6,7 +6,7 @@ then
exit 1 exit 1
fi fi
mpiexec=$1 mpiexec=`basename $1`
npflag=$2 npflag=$2
nproc=$3 nproc=$3
srcdir=$4 srcdir=$4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment