瀏覽代碼

Only skip dependency_on_destroyed_task if it is running on valgrind.

Cyril Roelandt 13 年之前
父節點
當前提交
4169fc590c
共有 1 個文件被更改,包括 5 次插入9 次删除
  1. 5 9
      tests/main/dependency_on_destroyed_task.c

+ 5 - 9
tests/main/dependency_on_destroyed_task.c

@@ -12,13 +12,6 @@
  * probably OK to disable it for a while :-) Maybe we could also detect
  * probably OK to disable it for a while :-) Maybe we could also detect
  * destroyed tasks in starpu_task_declare_deps_array.
  * destroyed tasks in starpu_task_declare_deps_array.
  */
  */
-#ifdef STARPU_HAVE_VALGRIND_H
-int
-main(void)
-{
-	return STARPU_TEST_SKIPPED;
-}
-#else
 static void abort_catcher(int sig)
 static void abort_catcher(int sig)
 {
 {
 	(void) sig;
 	(void) sig;
@@ -31,6 +24,11 @@ static void abort_catcher(int sig)
 int
 int
 main(void)
 main(void)
 {
 {
+#ifdef STARPU_HAVE_VALGRIND_H
+	if (RUNNING_ON_VALGRIND)
+		return STARPU_TEST_SKIPPED;
+#endif	
+
 	int ret;
 	int ret;
 	struct starpu_task *taskA, *taskB;
 	struct starpu_task *taskA, *taskB;
 
 
@@ -83,5 +81,3 @@ main(void)
 
 
 	return EXIT_FAILURE;
 	return EXIT_FAILURE;
 }
 }
-#endif
-