use correct number of CPUs when checking in master-slave mode

tests/Makefile.am

@@ -120,15 +120,16 @@ endif
 
 MPI 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 LOADER_BIN2		= $(MPI) $(LOADER_BIN)
+MPI_RUN_ARGS		= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
 else
 LOADER_BIN2		= $(LOADER_BIN)
 endif
 
 if STARPU_HAVE_AM111
-TESTS_ENVIRONMENT   =   top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
+TESTS_ENVIRONMENT   =   $(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER        =   $(LOADER_BIN2)
 else
-TESTS_ENVIRONMENT   =   top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
+TESTS_ENVIRONMENT   =   $(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
 endif
 endif
 

tools/Makefile.am

@@ -194,16 +194,17 @@ endif
 if STARPU_USE_MPI_MASTER_SLAVE 
 MPI		= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 LOADER_BIN2	= $(MPI) $(LOADER_BIN)
+MPI_RUN_ARGS	= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4
 else
 LOADER_BIN2	= $(LOADER_BIN)
 endif
 
 
 if STARPU_HAVE_AM111
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN2)
 else
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
+TESTS_ENVIRONMENT	=	$(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN2)
 endif
 
 endif