Browse Source

skip some tests on MIC

Samuel Thibault 12 years ago
parent
commit
8127af9fc3
3 changed files with 21 additions and 2 deletions
  1. 8 1
      tests/errorcheck/starpu_init_noworker.c
  2. 7 1
      tests/main/restart.c
  3. 6 0
      tests/main/starpu_init.c

+ 8 - 1
tests/errorcheck/starpu_init_noworker.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010, 2012  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010, 2012-2013  Université de Bordeaux 1
  * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -44,6 +44,13 @@ int main(int argc, char **argv)
 
 	unset_env_variables();
 
+#ifdef STARPU_USE_MIC
+#ifdef STARPU_DEVEL
+#warning nmic = 0 make initialization hang and leaves a process behind...
+#endif
+	return STARPU_TEST_SKIPPED;
+#endif
+
 	/* We try to initialize StarPU without any worker */
 	struct starpu_conf conf;
 	starpu_conf_init(&conf);

+ 7 - 1
tests/main/restart.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010, 2013  Université de Bordeaux 1
  * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -49,6 +49,12 @@ int main(int argc, char **argv)
 		gettimeofday(&end, NULL);
 		if (ret == -ENODEV)
 			goto enodev;
+
+		if (starpu_worker_get_type(STARPU_MIC_WORKER))
+#ifdef STARPU_DEVEL
+#warning MIC does not support restart yet
+#endif
+			goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 		init_timing += (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 

+ 6 - 0
tests/main/starpu_init.c

@@ -56,6 +56,12 @@ static int check_cpu(int env_cpu, int conf_cpu, int expected_cpu, int *cpu)
 	}
 
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+
+#ifdef STARPU_DEVEL
+#warning MIC does not support restart yet
+#endif
+	if (starpu_worker_get_type(STARPU_MIC_WORKER)) return STARPU_TEST_SKIPPED;
+
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	*cpu = starpu_cpu_worker_get_count();