tests: move tests/opt back to tests

tests/Makefile.am

@@ -186,6 +186,8 @@ noinst_PROGRAMS =				\
 	datawizard/in_place_partition   	\
 	datawizard/partition_lazy		\
 	datawizard/gpu_register   		\
+	datawizard/wt_host			\
+	datawizard/wt_broadcast			\
 	errorcheck/starpu_init_noworker		\
 	errorcheck/invalid_blocking_calls	\
 	errorcheck/invalid_tasks		\
@@ -312,6 +314,11 @@ datawizard_gpu_register_SOURCES +=	\
 	datawizard/scal_opencl.cl
 endif
 
+datawizard_wt_host_SOURCES =			\
+	datawizard/wt_host.c
+datawizard_wt_broadcast_SOURCES =		\
+	datawizard/wt_broadcast.c
+
 if STARPU_USE_GORDON
 datawizard_sync_and_notify_data_SOURCES +=	\
 	datawizard/sync_and_notify_data_gordon_kernels.c

tests/opt/datawizard/wt_broadcast.c

@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <starpu.h>
-#include "../../helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/opt/datawizard/wt_host.c

@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <starpu.h>
-#include "../../helper.h"
+#include "../helper.h"
 
 #ifdef STARPU_USE_CUDA
 #include <starpu_cuda.h>

tests/opt/Makefile.am

@@ -1,48 +0,0 @@
-# StarPU --- Runtime system for heterogeneous multicore architectures.
-#
-# Copyright (C) 2009, 2010, 2011-2012  Université de Bordeaux 1
-# Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
-# Copyright (C) 2010, 2011  Institut National de Recherche en Informatique et Automatique
-#
-# StarPU is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or (at
-# your option) any later version.
-#
-# StarPU is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the GNU Lesser General Public License in COPYING.LGPL for more details.
-
-AM_CFLAGS = $(HWLOC_CFLAGS) -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS)
-LIBS = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(HWLOC_LIBS) @LIBS@
-AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/src/ -I$(top_builddir)/src
-AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS)
-
-optbindir = $(libdir)/starpu/tests
-optbin_PROGRAMS =
-
-SUBDIRS =
-
-TESTS = $(check_PROGRAMS)
-
-check_PROGRAMS =
-
-check_PROGRAMS += 				\
-	datawizard/wt_host			\
-	datawizard/wt_broadcast
-
-optbin_PROGRAMS +=				\
-	datawizard/wt_host
-datawizard_wt_host_SOURCES =			\
-	datawizard/wt_host.c
-
-optbin_PROGRAMS +=				\
-	datawizard/wt_broadcast
-datawizard_wt_broadcast_SOURCES =		\
-	datawizard/wt_broadcast.c
-
-
-showcheck:
-	-cat $(TEST_LOGS) /dev/null