瀏覽代碼

Run shell tests early

They are usually longer tests, so for parallel test execution they
should be started as early as possible.
Samuel Thibault 5 年之前
父節點
當前提交
7ad9e203ae
共有 2 個文件被更改,包括 17 次插入13 次删除
  1. 8 6
      examples/Makefile.am
  2. 9 7
      tests/Makefile.am

+ 8 - 6
examples/Makefile.am

@@ -146,13 +146,15 @@ noinst_HEADERS = 				\
 
 examplebin_PROGRAMS 	+=	$(STARPU_EXAMPLES)
 
-TESTS			=	$(STARPU_EXAMPLES)
+TESTS			=	$(SHELL_TESTS) $(STARPU_EXAMPLES)
+
+SHELL_TESTS =
 
 if !STARPU_USE_MPI_MASTER_SLAVE
-TESTS			+=	scheduler/schedulers.sh
-TESTS			+=	scheduler/schedulers_context.sh
+SHELL_TESTS			+=	scheduler/schedulers.sh
+SHELL_TESTS			+=	scheduler/schedulers_context.sh
 if !NO_BLAS_LIB
-TESTS			+=	mult/sgemm.sh
+SHELL_TESTS			+=	mult/sgemm.sh
 endif
 endif
 
@@ -324,7 +326,7 @@ STARPU_EXAMPLES +=				\
 	pipeline/pipeline
 
 if !STARPU_USE_MPI_MASTER_SLAVE
-TESTS += \
+SHELL_TESTS += \
 	heat/heat.sh				\
 	lu/lu.sh
 
@@ -334,7 +336,7 @@ endif
 
 if STARPU_SIMGRID
 if !STARPU_QUICK_CHECK
-TESTS += \
+SHELL_TESTS += \
 	 cholesky/cholesky.sh
 endif
 endif

+ 9 - 7
tests/Makefile.am

@@ -126,10 +126,12 @@ TESTS_ENVIRONMENT   =   $(MPI_RUN_ARGS) top_builddir="$(abs_top_builddir)" top_s
 endif
 endif
 
-TESTS = $(myPROGRAMS)
+TESTS = $(SHELL_TESTS) $(myPROGRAMS)
+
+SHELL_TESTS =
 
 if STARPU_COVERAGE_ENABLED
-TESTS	+=	coverage/coverage.sh
+SHELL_TESTS	+=	coverage/coverage.sh
 endif
 
 XFAIL_TESTS	=				\
@@ -399,7 +401,7 @@ examplebin_SCRIPTS = \
 	microbenchs/tasks_size_overhead.sh
 if !STARPU_SIMGRID
 if !STARPU_USE_MPI_MASTER_SLAVE
-TESTS += \
+SHELL_TESTS += \
 	microbenchs/tasks_data_overhead.sh \
 	microbenchs/sync_tasks_data_overhead.sh \
 	microbenchs/async_tasks_data_overhead.sh \
@@ -416,11 +418,11 @@ noinst_PROGRAMS = $(myPROGRAMS)
 noinst_PROGRAMS += $(MICROBENCHS)
 
 if STARPU_SIMGRID
-TESTS += $(MICROBENCHS:=.sh)
+SHELL_TESTS += $(MICROBENCHS:=.sh)
 endif
 
 if !STARPU_USE_MPI_MASTER_SLAVE
-TESTS += \
+SHELL_TESTS += \
 	datawizard/locality.sh \
 	overlap/overlap.sh
 endif
@@ -434,14 +436,14 @@ model_checking_prio_list_LDADD =
 model_checking_prio_list_LDFLAGS = 
 noinst_PROGRAMS += model-checking/prio_list
 if !STARPU_QUICK_CHECK
-TESTS += model-checking/prio_list.sh
+SHELL_TESTS += model-checking/prio_list.sh
 endif
 
 model_checking_starpu_barrier_LDADD = 
 model_checking_starpu_barrier_LDFLAGS = 
 noinst_PROGRAMS += model-checking/starpu_barrier
 if !STARPU_QUICK_CHECK
-#TESTS += model-checking/barrier.sh
+#SHELL_TESTS += model-checking/barrier.sh
 endif
 endif