From fdac17fa19881504e87c4693c18c897ac6d190b6 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Wed, 29 May 2019 12:09:24 -0400 Subject: [PATCH] Switch to using MPIEXEC_EXECUTABLE rather than MPIEXEC in staging-common --- testing/adios2/engine/staging-common/CMakeLists.txt | 2 +- testing/adios2/engine/staging-common/run_test.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt index b1e655d93d..754126430c 100644 --- a/testing/adios2/engine/staging-common/CMakeLists.txt +++ b/testing/adios2/engine/staging-common/CMakeLists.txt @@ -93,7 +93,7 @@ include (TestSupp.cmake ) if (ADIOS2_HAVE_MPI) # we want to know if mpiexec is a shell script or a binary executable - file(READ ${MPIEXEC} MPIFILEDATA LIMIT 1024 HEX) + file(READ ${MPIEXEC_EXECUTABLE} MPIFILEDATA LIMIT 1024 HEX) string(LENGTH ${MPIFILEDATA} DATALENGTH) math(EXPR last_hex_index "(${DATALENGTH} / 2) - 1") foreach(hex_index RANGE ${last_hex_index}) diff --git a/testing/adios2/engine/staging-common/run_test.in b/testing/adios2/engine/staging-common/run_test.in index bcd944231e..13129ddf8e 100755 --- a/testing/adios2/engine/staging-common/run_test.in +++ b/testing/adios2/engine/staging-common/run_test.in @@ -172,10 +172,10 @@ else : if args.reader is None: args.reader = 'TestCommonClient' -writer_exec_cmd = '@MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ ' + str(args.num_writers); -reader_exec_cmd = '@MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ ' + str(args.num_readers); +writer_exec_cmd = '@MPIEXEC_EXECUTABLE@ @MPIEXEC_NUMPROC_FLAG@ ' + str(args.num_writers); +reader_exec_cmd = '@MPIEXEC_EXECUTABLE@ @MPIEXEC_NUMPROC_FLAG@ ' + str(args.num_readers); -if ("@MPIEXEC@" == "") or ("@MPIEXEC@" == "MPIEXEC_EXECUTABLE-NOTFOUND"): +if ("@MPIEXEC_EXECUTABLE@" == "") or ("@MPIEXEC_EXECUTABLE@" == "MPIEXEC_EXECUTABLE-NOTFOUND"): # NO MPI writer_exec_cmd = ''; reader_exec_cmd = '';