Update timeout for looping test when failing

tests/Makefile.am

@@ -111,7 +111,17 @@ LOADER_BIN		=	$(top_builddir)/tests/loader-cross.sh
 endif
 
 if STARPU_USE_MPI_MASTER_SLAVE
-MPI 			= $(MPIEXEC) $(MPIEXEC_ARGS) -np 4
+if STARPU_QUICK_CHECK
+export MPIEXEC_TIMEOUT=60
+else 
+if STARPU_LONG_CHECK
+export MPIEXEC_TIMEOUT=1800
+else
+export MPIEXEC_TIMEOUT=300
+endif
+endif
+
+MPI 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 LOADER_BIN2		= $(MPI) $(LOADER_BIN)
 else
 LOADER_BIN2		= $(LOADER_BIN)

tests/datawizard/interfaces/multiformat/advanced/multiformat_data_release.c

@@ -151,6 +151,7 @@ main(int argc, char **argv)
 	conf.ncuda = 1;
 	conf.nopencl = 1;
 	conf.nmic = 1;
+	conf.nmpi_ms = 0;
 	memset(&global_stats, 0, sizeof(global_stats));
 	ret = starpu_initialize(&conf, &argc, &argv);
 	if (ret == -ENODEV || starpu_cpu_worker_get_count() == 0) return STARPU_TEST_SKIPPED;

tests/loader.c

@@ -260,6 +260,16 @@ int main(int argc, char *argv[])
 	if (timeout <= 0)
 		timeout = DEFAULT_TIMEOUT;
 
+#ifdef STARPU_USE_MPI_MASTER_SLAVE
+	/* compare values between the 2 values of timeout */
+	if (getenv("MPIEXEC_TIMEOUT"))
+	{
+		int mpiexec_timeout = strtol(getenv("MPIEXEC_TIMEOUT"), NULL, 10);	
+		if (mpiexec_timeout != timeout)
+			fprintf(stderr, "[warning] MPIEXEC_TIMEOUT and STARPU_TIMEOUT_ENV values are different (%d and %d). The behavior may be different than expected !\n", mpiexec_timeout, timeout);
+	}
+#endif
+
 	if (strstr(test_name, "tasks_size_overhead_scheds.sh"))
 		/* This extensively tests various schedulers, let it run longer */
 		timeout *= 10;