54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
|
diff -Naur old/BLACS/TESTING/CMakeLists.txt new/BLACS/TESTING/CMakeLists.txt
|
||
|
|
--- old/BLACS/TESTING/CMakeLists.txt 2021-03-30 09:32:24.182858322 +0000
|
||
|
|
+++ new/BLACS/TESTING/CMakeLists.txt 2021-03-30 09:34:59.074871318 +0000
|
||
|
|
@@ -30,6 +30,7 @@
|
||
|
|
${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,9 +42,10 @@
|
||
|
|
${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}
|
||
|
|
-DSOURCEDIR=${CMAKE_CURRENT_SOURCE_DIR}
|
||
|
|
-P ${CMAKE_CURRENT_SOURCE_DIR}/runtest.cmake
|
||
|
|
- )
|
||
|
|
\ No newline at end of file
|
||
|
|
+ )
|
||
|
|
diff -Naur old/BLACS/TESTING/runtest.cmake new/BLACS/TESTING/runtest.cmake
|
||
|
|
--- old/BLACS/TESTING/runtest.cmake 2021-03-30 09:32:09.501969838 +0000
|
||
|
|
+++ new/BLACS/TESTING/runtest.cmake 2021-03-30 09:37:37.604868576 +0000
|
||
|
|
@@ -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 @@
|
||
|
|
# 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")
|