From 33f07ad7db4b5eb100477a3432b24ed1789c7c8a Mon Sep 17 00:00:00 2001 From: Christian Kern Date: Tue, 31 Mar 2015 09:31:00 +0200 Subject: [PATCH] Revert "Only run opencl tests if opencl is installed. Otherwise skip those tests." This reverts commit fca2298d7233519848ba6328cf79cfb564f9b02c. --- doc/examples/main.cc | 10 +--------- mtapi_opencl_c/test/main.cc | 13 ++----------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/doc/examples/main.cc b/doc/examples/main.cc index 519121f..54414bf 100644 --- a/doc/examples/main.cc +++ b/doc/examples/main.cc @@ -26,7 +26,6 @@ #include #include -#include "../../mtapi_opencl_c/src/embb_mtapi_opencl_runtimelinker.h" void RunMTAPI_C(); void RunMTAPI_C_Plugin(); @@ -68,14 +67,7 @@ int main() { std::cout << "RunMTAPI_C_Network() ... done" << std::endl; std::cout << "RunMTAPI_C_OpenCL() ..." << std::endl; - if (embb_mtapi_opencl_link_at_runtime() != 0) { - RunMTAPI_C_OpenCL(); - } - else { - ::std::cout << - "! Skipping OpenCL tests, as OpenCL is not installed on your system." << - ::std::endl; - } + RunMTAPI_C_OpenCL(); std::cout << "RunMTAPI_C_OpenCL() ... done" << std::endl; std::cout << "RunMTAPI_CPP() ..." << std::endl; diff --git a/mtapi_opencl_c/test/main.cc b/mtapi_opencl_c/test/main.cc index 5ab6423..0888cac 100644 --- a/mtapi_opencl_c/test/main.cc +++ b/mtapi_opencl_c/test/main.cc @@ -29,17 +29,8 @@ #include #include -#include - PT_MAIN("MTAPI OPENCL") { - if ( embb_mtapi_opencl_link_at_runtime() != 0 ) { - PT_RUN(LinkerTest); - PT_RUN(TaskTest); - } - else { - ::std::cout << - "! Skipping OpenCL tests, as OpenCL is not installed on your system." << - ::std::endl; - } + PT_RUN(LinkerTest); + PT_RUN(TaskTest); } -- libgit2 0.26.0