Просмотр исходного кода

Factorize recheck/showfailed/showcheck/showsuite

Samuel Thibault лет назад: 5
Родитель
Сommit
65004a1a4f

+ 4 - 12
doc/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS = doxygen
 SUBDIRS += doxygen_dev
 DIST_SUBDIRS = doxygen
@@ -32,15 +36,3 @@ EXTRA_DIST =    tutorial/hello_world.c \
 
 txtdir = ${docdir}/tutorial
 txt_DATA = $(EXTRA_DIST)
-
-recheck:
-	-cat /dev/null
-
-showfailed:
-	@-cat /dev/null
-
-showcheck:
-	-cat /dev/null
-
-showsuite:
-	-cat /dev/null

+ 4 - 28
mpi/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = subdirs
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS=src tests examples
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -25,31 +29,3 @@ versinclude_HEADERS = 					\
 	include/starpu_mpi.h				\
 	include/starpu_mpi_lb.h				\
 	include/fstarpu_mpi_mod.f90
-
-recheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i recheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showfailed:
-	@RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showfailed || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showcheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showcheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showsuite:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showsuite || RET=1 ; \
-	done ; \
-	exit $$RET

+ 4 - 9
mpi/src/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 CC=$(MPICC)
 CCLD=$(MPICC)
 
@@ -110,12 +114,3 @@ libstarpumpi_@STARPU_EFFECTIVE_VERSION@_la_SOURCES =	\
 	load_balancer/policy/load_data_interface.c	\
 	load_balancer/policy/load_heat_propagation.c	\
 	load_balancer/load_balancer.c
-
-recheck:
-	-cat /dev/null
-showfailed:
-	@-cat /dev/null
-showcheck:
-	-cat /dev/null
-showsuite:
-	-cat /dev/null

+ 4 - 21
sc_hypervisor/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = subdirs
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS = src examples
 
 versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
@@ -24,24 +28,3 @@ versinclude_HEADERS = 	include/sc_hypervisor.h			\
 			include/sc_hypervisor_monitoring.h 	\
 			include/sc_hypervisor_policy.h 		\
 			include/sc_hypervisor_lp.h
-
-showfailed:
-	@RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showfailed || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showcheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showcheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showsuite:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showsuite || RET=1 ; \
-	done ; \
-	exit $$RET

+ 4 - 9
sc_hypervisor/src/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS) $(GLOBAL_AM_CFLAGS)
 LIBS = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/sc_hypervisor/include/ -I$(top_srcdir)/sc_hypervisor/src
@@ -45,12 +49,3 @@ libsc_hypervisor_la_SOURCES = 				\
 	hypervisor_policies/perf_count_policy.c
 
 noinst_HEADERS = sc_hypervisor_intern.h
-
-showfailed:
-	@-cat /dev/null
-
-showcheck:
-	-cat /dev/null
-
-showsuite:
-	-cat /dev/null

+ 3 - 9
socl/src/Makefile.am

@@ -16,6 +16,9 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 CLEANFILES = *.gcno *.gcda
 
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS) $(FXT_CFLAGS)
@@ -135,12 +138,3 @@ libsocl_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 						\
   cl_geteventprofilinginfo.c \
   cl_getextensionfunctionaddress.c \
   cl_icdgetplatformidskhr.c
-
-recheck:
-	-cat /dev/null
-showfailed:
-	@-cat /dev/null
-showcheck:
-	-cat /dev/null
-showsuite:
-	-cat /dev/null

+ 4 - 9
src/Makefile.am

@@ -16,6 +16,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
@@ -412,12 +416,3 @@ dist-hook:
 		done ; \
 	done ; \
 	[ $$failed == 0 ]
-
-recheck:
-	-cat /dev/null
-showfailed:
-	@-cat /dev/null
-showcheck:
-	-cat /dev/null
-showsuite:
-	-cat /dev/null

+ 47 - 0
starpu.mk

@@ -16,6 +16,52 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
+ifeq ($(TESTS_TYPE),none)
+recheck:
+	-cat /dev/null
+
+showfailed:
+	@-cat /dev/null
+
+showcheck:
+	-cat /dev/null
+
+showsuite:
+	-cat /dev/null
+endif
+
+ifeq ($(TESTS_TYPE),subdirs)
+recheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i recheck || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showfailed:
+	@RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showfailed || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showcheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showcheck || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showsuite:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showsuite || RET=1 ; \
+	done ; \
+	exit $$RET
+endif
+
+ifeq ($(TESTS_TYPE),tests)
+
 if STARPU_USE_MPI_MASTER_SLAVE
 MPI_LAUNCHER 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 MPI_RUN_ARGS			= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4 STARPU_NMPIMSTHREADS=4
@@ -83,3 +129,4 @@ env:
 	@echo export MALLOC_PERTURB_=$(MALLOC_PERTURB_)
 endif
 
+endif

+ 3 - 9
starpufft/src/Makefile.am

@@ -16,6 +16,9 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(HWLOC_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/starpufft/include/ -I$(top_builddir)/include -I$(top_builddir)/src -I$(top_srcdir)/src/ $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS)
 
@@ -60,12 +63,3 @@ endif
 libstarpufft_@STARPU_EFFECTIVE_VERSION@_la_LIBADD +=  $(STARPU_CUDA_LDFLAGS)
 endif
 endif
-
-recheck:
-	-cat /dev/null
-showfailed:
-	@-cat /dev/null
-showcheck:
-	-cat /dev/null
-showsuite:
-	-cat /dev/null

+ 4 - 29
starpurm/Makefile.am

@@ -13,6 +13,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = subdirs
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS=src
 
 if BUILD_STARPURM_EXAMPLES
@@ -28,32 +32,3 @@ versinclude_HEADERS = 					\
 
 nodist_versinclude_HEADERS = \
 	include/starpurm_config.h
-
-recheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i recheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showfailed:
-	@RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showfailed || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showcheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showcheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-
-showsuite:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showsuite || RET=1 ; \
-	done ; \
-	exit $$RET

+ 4 - 9
starpurm/src/Makefile.am

@@ -15,6 +15,10 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
+
+TESTS_TYPE = none
+include $(top_srcdir)/starpu.mk
+
 SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
@@ -43,12 +47,3 @@ endif
 
 noinst_HEADERS = 					\
 	starpurm_private.h
-
-showfailed:
-	@-cat /dev/null
-
-showcheck:
-	-cat /dev/null
-
-showsuite:
-	-cat /dev/null