skip invalid_blocing_calls test if master-slave mode is enable because mpirun doesn't exit on some computers

starpu.mk

@@ -16,17 +16,17 @@
 
 if STARPU_USE_MPI_MASTER_SLAVE
 if STARPU_QUICK_CHECK
-export MPIEXEC_TIMEOUT=60
+MPI_TIMEOUT = MPIEXEC_TIMEOUT=60
 else 
 if STARPU_LONG_CHECK
-export MPIEXEC_TIMEOUT=1800
+MPI_TIMEOUT = MPIEXEC_TIMEOUT=1800
 else
-export MPIEXEC_TIMEOUT=300
+MPI_TIMEOUT = MPIEXEC_TIMEOUT=300
 endif
 endif
 
 MPI_LAUNCHER 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
-MPI_RUN_ARGS			= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
+MPI_RUN_ARGS			= $(MPI_TIMEOUT) STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
 endif
 
 showcheck:

tests/errorcheck/invalid_blocking_calls.c

@@ -24,7 +24,8 @@
  * codelet function, which is invalid. This test is thus expected to fail.
  */
 
-#ifdef STARPU_NO_ASSERT
+/* mpirun may not exit if it fails, skip the test for master-slave */
+#if defined(STARPU_NO_ASSERT) || defined(STARPU_USE_MPI_MASTER_SLAVE)
 int main(int argc, char **argv)
 {
 	return STARPU_TEST_SKIPPED;