Merge pull request #1462 from eisenhauer/SwitchMPIEXECVar

Switch to using MPIEXEC_EXECUTABLE rather than MPIEXEC in staging-common
ornladios · May 29, 2019 · 70d712c · 70d712c
2 parents eafc774 + fdac17f
commit 70d712c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 = '';