瀏覽代碼

build: Adjust tests to Automake 1.12.

Ludovic Courtès 12 年之前
父節點
當前提交
74ac8f3079
共有 6 個文件被更改,包括 10 次插入6 次删除
  1. 2 1
      examples/Makefile.am
  2. 1 1
      gcc-plugin/tests/Makefile.am
  3. 1 1
      mpi/Makefile.am
  4. 2 1
      socl/examples/Makefile.am
  5. 2 1
      tests/Makefile.am
  6. 2 1
      tools/Makefile.am

+ 2 - 1
examples/Makefile.am

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

+ 1 - 1
gcc-plugin/tests/Makefile.am

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

+ 1 - 1
mpi/Makefile.am

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

+ 2 - 1
socl/examples/Makefile.am

@@ -35,7 +35,8 @@ 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
-TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(LOADER_BIN)
+TESTS_ENVIRONMENT	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)"
+LOG_COMPILER		=	$(LOADER_BIN)
 endif
 
 examplebindir = $(libdir)/starpu/examples/socl/

+ 2 - 1
tests/Makefile.am

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

+ 2 - 1
tools/Makefile.am

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