From 8d0e1dc7e6347721b4ed9fa6a835a2bce56810c7 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Thu, 25 Oct 2018 22:16:22 +0200
Subject: [PATCH] Set OptionalCatchTestLauncher when testing with MPI

Now test names are deduced similarly to sequential unit tests

Fixes #2
---
 tests/CMakeLists.txt | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b817c9a89..394e2c339 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,15 +39,8 @@ enable_testing()
 #parse catch tests
 ParseAndAddCatchTests(unit_tests)
 
-if (${PASTIS_HAS_MPI})
-  add_test(mpi_unit_tests ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 3 "--oversubscribe"
-    ${MPIEXEC_PREFLAGS}
-    ${PASTIS_BINARY_DIR}/mpi_unit_tests
-    ${MPIEXEC_POSTFLAGS})
-else()
-  add_test(mpi_unit_tests ${PASTIS_BINARY_DIR}/mpi_unit_tests)
+if(${PASTIS_HAS_MPI})
+set(OptionalCatchTestLauncher ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 3 --oversubscribe --path ${PASTIS_BINARY_DIR})
 endif()
-
-# Should patch ParseAndAddCatchTests macro to allow additional command parameter
-# to launch tests
-set_tests_properties("mpi_unit_tests" PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran" LABELS "mpi")
+ParseAndAddCatchTests(mpi_unit_tests)
+unset(OptionalCatchTestLauncher)
-- 
GitLab