summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff/CMakeTests.cmake
diff options
context:
space:
mode:
authorjhendersonHDF <jhenderson@hdfgroup.org>2023-09-01 15:01:56 (GMT)
committerGitHub <noreply@github.com>2023-09-01 15:01:56 (GMT)
commit3cfdca6dc9d9f255f1e51c1718f811aa960bfc07 (patch)
tree06ef740622a1f8e22f5dda3e74339708ec023dd6 /tools/test/h5diff/CMakeTests.cmake
parentfdeac5309eceeed5159dcbc60de4161f144593ef (diff)
downloadhdf5-3cfdca6dc9d9f255f1e51c1718f811aa960bfc07.zip
hdf5-3cfdca6dc9d9f255f1e51c1718f811aa960bfc07.tar.gz
hdf5-3cfdca6dc9d9f255f1e51c1718f811aa960bfc07.tar.bz2
Fix ph5diff tests for MPIEXEC_MAX_NUMPROCS=1 (#3407) (#3468)
Diffstat (limited to 'tools/test/h5diff/CMakeTests.cmake')
-rw-r--r--tools/test/h5diff/CMakeTests.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 73d435f..b23f885 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -432,11 +432,13 @@
add_test (
NAME MPI_TEST_H5DIFF-${resultfile}
COMMAND "${CMAKE_COMMAND}"
- -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5diff${tgt_file_ext}>;${MPIEXEC_POSTFLAGS}"
- -D "TEST_ARGS:STRING=${ARGN}"
+ -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE}"
+ -D "TEST_ARGS:STRING=${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5diff${tgt_file_ext}>;${MPIEXEC_POSTFLAGS};${ARGN}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/PAR/testfiles"
-D "TEST_OUTPUT=${resultfile}.out"
- -D "TEST_EXPECT=0"
+ #-D "TEST_EXPECT=${resultcode}"
+ -D "TEST_EXPECT=0" # ph5diff currently always exits with a zero status code due to
+ # output from some MPI implementations from a non-zero exit code
-D "TEST_REFERENCE=${resultfile}.txt"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_REF_APPEND=EXIT CODE: [0-9]"