Include valgrind.h in helper.h, not directly in the tests.

tests/core/deprecated_buffer.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/core/deprecated_func.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/core/get_current_task.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <sys/time.h>
 #include <stdio.h>
 #include <unistd.h>

tests/core/insert_task.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/core/starpu_task_bundle.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/acquire_cb_insert.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/acquire_release.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/acquire_release2.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/critical_section_with_void_interface.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/data_implicit_deps.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/data_invalidation.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/increment_redux.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/increment_redux_v2.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/interfaces/bcsr/bcsr_interface.c

@@ -15,9 +15,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/bcsr/bcsr_opencl.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/block/block_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/block/block_opencl.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/csr/csr_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/csr/csr_opencl.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/matrix/matrix_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/matrix/matrix_opencl.c

@@ -13,9 +13,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/multiformat/advanced/generic.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu_data_interfaces.h>
 #include "generic.h"
 #include "../../../../helper.h"

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "multiformat_types.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets_opencl.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../../../helper.h"

tests/datawizard/interfaces/multiformat/multiformat_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "multiformat_types.h"
 #include "../test_interfaces.h"

tests/datawizard/interfaces/multiformat/multiformat_opencl.c

@@ -13,9 +13,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/variable/variable_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 

tests/datawizard/interfaces/variable/variable_opencl.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/interfaces/vector/test_vector_interface.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../test_interfaces.h"
 #include "../../../helper.h"

tests/datawizard/interfaces/vector/test_vector_opencl.c

@@ -14,9 +14,6 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../test_interfaces.h"

tests/datawizard/lazy_allocation.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/manual_reduction.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/datawizard/mpi_like.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <errno.h>
 #include <pthread.h>

tests/datawizard/mpi_like_async.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <pthread.h>
 #include "../helper.h"

tests/datawizard/scal.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "scal.h"

tests/datawizard/scratch.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/sync_and_notify_data.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/sync_and_notify_data_implicit.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/datawizard/sync_and_notify_data_opencl.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <starpu_opencl.h>
 #include "../helper.h"

tests/datawizard/write_only_tmp_buffer.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/errorcheck/invalid_blocking_calls.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/helper.h

@@ -17,6 +17,10 @@
 #include <errno.h>
 #include <common/utils.h>
 
+#ifdef STARPU_HAVE_VALGRIND_H
+#include <valgrind/valgrind.h>
+#endif
+
 #define STARPU_TEST_SKIPPED 77
 
 //void *ALL_IS_OK = (void *)123456789L;

tests/opt/datawizard/wt_broadcast.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../../helper.h"
 

tests/opt/datawizard/wt_host.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../../helper.h"
 

tests/overlap/overlap.c

@@ -17,9 +17,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/parallel_tasks/explicit_combined_worker.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>

tests/parallel_tasks/parallel_kernels.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>

tests/parallel_tasks/parallel_kernels_spmd.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>

tests/parallel_tasks/spmd_pgreedy.c

@@ -15,9 +15,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include <limits.h>
 #include <unistd.h>

tests/perfmodels/non_linear_regression_based.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"
 

tests/perfmodels/regression_based.c

@@ -16,9 +16,6 @@
  */
 
 #include <config.h>
-#if STARPU_HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
 #include <starpu.h>
 #include "../helper.h"