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

build: partly revert 7205 by testing automake version as LOG_COMPILER has been introduced in version 1.11.

* configure.ac: detect version of automake and set STARPU_HAVE_AM111 accordingly
* socl/examples/Makefile.am, tools/Makefile.am, tests/Makefile.am,
  examples/Makefile.am, mpi/Makefile.am, gcc-plugin/tests/Makefile.am:
     test STARPU_HAVE_AM111 and set TESTS_ENVIRONMENT and LOG_COMPILER
     accordingly
Nathalie Furmento лет назад: 12
Родитель
Сommit
877a3b3bdd
7 измененных файлов с 39 добавлено и 1 удалено
  1. 7 0
      configure.ac
  2. 6 0
      examples/Makefile.am
  3. 4 0
      gcc-plugin/tests/Makefile.am
  4. 5 1
      mpi/Makefile.am
  5. 6 0
      socl/examples/Makefile.am
  6. 5 0
      tests/Makefile.am
  7. 6 0
      tools/Makefile.am

+ 7 - 0
configure.ac

@@ -1689,6 +1689,13 @@ AC_CHECK_MEMBER([struct cudaDeviceProp.pciBusID],
   AC_DEFINE([STARPU_HAVE_BUSID],[1],[Define to 1 if CUDA device properties include BusID]),
   , [[#include <cuda_runtime_api.h>]])
 
+dnl Check automake version is greater or equal to 1.11
+dnl Automake 1.11 introduced `silent-rules'. Test its availability to check the version of automake
+m4_ifdef([AM_SILENT_RULES],
+  AM_CONDITIONAL([STARPU_HAVE_AM111], [true]),
+  AM_CONDITIONAL([STARPU_HAVE_AM111], [false])
+)
+
 # File configuration
 AC_CONFIG_COMMANDS([executable-scripts], [
   chmod +x tests/regression/regression.sh

+ 6 - 0
examples/Makefile.am

@@ -166,8 +166,14 @@ LOADER			=	loader
 loader_CPPFLAGS =  $(AM_CFLAGS) $(AM_CPPFLAGS) -I$(top_builddir)/src/
 LOADER_BIN		=	$(abs_top_builddir)/examples/$(LOADER)
 loader_SOURCES		=	../tests/loader.c
+
+if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN)
+else
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+endif
+
 endif
 
 examplebin_PROGRAMS +=				\

+ 4 - 0
gcc-plugin/tests/Makefile.am

@@ -90,7 +90,11 @@ EXTRA_DIST += ./run-test.in			\
 if RUN_GCC_PLUGIN_TESTS
 
 TESTS = $(gcc_tests)
+if STARPU_HAVE_AM111
+TESTS_ENVIRONMENT = ./run-test
+else
 LOG_COMPILER = ./run-test
+endif
 
 else !RUN_GCC_PLUGIN_TESTS
 

+ 5 - 1
mpi/Makefile.am

@@ -18,7 +18,11 @@ CC=$(MPICC)
 CCLD=$(MPICC)
 
 if STARPU_MPI_CHECK
-LOG_COMPILER	=	$(MPIEXEC) -np 2
+if STARPU_HAVE_AM111
+TESTS_ENVIRONMENT 	=	$(MPIEXEC) -np 2
+else
+LOG_COMPILER	 	=	$(MPIEXEC) -np 2
+endif
 TESTS			=	$(check_PROGRAMS)
 endif
 

+ 6 - 0
socl/examples/Makefile.am

@@ -35,8 +35,14 @@ LOADER			=	loader
 loader_CPPFLAGS 	=	$(AM_CFLAGS) $(AM_CPPFLAGS) -I$(top_builddir)/src/
 LOADER_BIN		=	$(abs_top_builddir)/socl/examples/$(LOADER)
 loader_SOURCES		=	../../tests/loader.c
+
+if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN)
+else
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+endif
+
 endif
 
 examplebindir = $(libdir)/starpu/examples/socl/

+ 5 - 0
tests/Makefile.am

@@ -100,8 +100,13 @@ if !STARPU_HAVE_WINDOWS
 ## test loader program
 LOADER			=	loader
 LOADER_BIN		=	$(abs_top_builddir)/tests/$(LOADER)
+
+if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN)
+else
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+endif
 endif
 
 TESTS = $(noinst_PROGRAMS)

+ 6 - 0
tools/Makefile.am

@@ -50,8 +50,14 @@ LOADER			=	loader
 loader_CPPFLAGS =  $(AM_CFLAGS) $(AM_CPPFLAGS) -I$(top_builddir)/src/
 LOADER_BIN		=	$(abs_top_builddir)/tools/$(LOADER)
 loader_SOURCES		=	../tests/loader.c
+
+if STARPU_HAVE_AM111
 TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
 LOG_COMPILER		=	$(LOADER_BIN)
+else
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+endif
+
 endif
 
 if STARPU_USE_FXT