1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Index: scalapack/BLACS/TESTING/runtest.cmake
===================================================================
--- scalapack.orig/BLACS/TESTING/runtest.cmake
+++ scalapack/BLACS/TESTING/runtest.cmake
@@ -1,9 +1,10 @@
message("Running BLACS TESTS")
-message(STATUS "${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./${TEST_PROG}")
+message(STATUS "${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./${TEST_PROG}")
message(STATUS "Output out_${TEST_PROG}.txt")
file(COPY ${RUNTIMEDIR}/${TEST_PROG} DESTINATION ${OUTPUTDIR})
-execute_process(COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./${TEST_PROG}
+separate_arguments(MPIEXEC_PREFLAGS)
+execute_process(COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./${TEST_PROG}
OUTPUT_FILE "out_${TEST_PROG}.txt"
ERROR_FILE "error_${TEST_PROG}.txt"
RESULT_VARIABLE HAD_ERROR)
@@ -13,10 +14,11 @@ if(HAD_ERROR)
# So we are going to check that the output have the last line of the testing : DONE BLACS_GRIDEXIT
file(READ "out_${TEST_PROG}.txt" TESTSTRING)
- STRING(REPLACE "DONE BLACS_GRIDEXIT" "BLACS OK" tmp ${TESTSTRING})
+ STRING(REPLACE "DONE BLACS_GRIDEXIT" "BLACS OK" tmp "${TESTSTRING}")
if("${tmp}" STREQUAL "${TESTSTRING}")
message( STATUS "Error in error_${TEST_PROG}.txt")
+ execute_process(COMMAND cat error_${TEST_PROG}.txt)
message(FATAL_ERROR "Test failed - Test did not reach DONE BLACS_GRIDEXIT")
else()
message( STATUS "Test Passed")
Index: scalapack/BLACS/TESTING/CMakeLists.txt
===================================================================
--- scalapack.orig/BLACS/TESTING/CMakeLists.txt
+++ scalapack/BLACS/TESTING/CMakeLists.txt
@@ -30,6 +30,7 @@ add_test(xCbtest
${CMAKE_COMMAND}
-DMPIEXEC=${MPIEXEC}
-DMPIEXEC_NUMPROC_FLAG=${MPIEXEC_NUMPROC_FLAG}
+ -DMPIEXEC_PREFLAGS=\$ENV{MPIEXEC_PREFLAGS}
-DTEST_PROG=xCbtest
-DOUTPUTDIR=${SCALAPACK_BINARY_DIR}/BLACS/TESTING
-DRUNTIMEDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
@@ -41,6 +42,7 @@ add_test(xFbtest
${CMAKE_COMMAND}
-DMPIEXEC=${MPIEXEC}
-DMPIEXEC_NUMPROC_FLAG=${MPIEXEC_NUMPROC_FLAG}
+ -DMPIEXEC_PREFLAGS=\$ENV{MPIEXEC_PREFLAGS}
-DTEST_PROG=xFbtest
-DOUTPUTDIR=${SCALAPACK_BINARY_DIR}/BLACS/TESTING
-DRUNTIMEDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
