tests/: further reduce test values when running on valgrind

tests/core/starpu_init.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	ret = check_cpu(cpu_init*3, cpu_init+1, cpu_init*3, &cpu);
 	if (ret) return ret;
 
-	return ret;
+	STARPU_RETURN(ret);
 }
 
  #endif

tests/core/starpu_task_wait.c

@@ -62,11 +62,6 @@ static void parse_args(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-
-#ifdef STARPU_HAVE_VALGRIND_H
-	if(RUNNING_ON_VALGRIND) return STARPU_TEST_SKIPPED;
-#endif
-
 	double timing;
 	struct timeval start;
 	struct timeval end;
@@ -77,6 +72,9 @@ int main(int argc, char **argv)
 #ifdef STARPU_SLOW_MACHINE
 	ntasks /= 1024;
 #endif
+#ifdef STARPU_HAVE_VALGRIND_H
+	if(RUNNING_ON_VALGRIND) ntasks = 5;
+#endif
 
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;

tests/core/static_restartable.c

@@ -55,10 +55,6 @@ static void parse_args(int argc, char **argv)
 int main(int argc, char **argv)
 {
 
-#ifdef STARPU_HAVE_VALGRIND_H
-	if(RUNNING_ON_VALGRIND) return STARPU_TEST_SKIPPED;
-#endif
-
 	unsigned i;
 	double timing;
 	struct timeval start;
@@ -70,6 +66,9 @@ int main(int argc, char **argv)
 #ifdef STARPU_SLOW_MACHINE
 	ntasks /= 100;
 #endif
+#ifdef STARPU_HAVE_VALGRIND_H
+	if(RUNNING_ON_VALGRIND) ntasks = 5;
+#endif
 
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;

tests/core/static_restartable_using_initializer.c

@@ -67,6 +67,9 @@ int main(int argc, char **argv)
 #ifdef STARPU_SLOW_MACHINE
 	ntasks /= 100;
 #endif
+#ifdef STARPU_HAVE_VALGRIND_H
+	if(RUNNING_ON_VALGRIND) ntasks = 5;
+#endif
 
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;