Stop using ../../test_common to include common headers

Fixes #395.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>

test_conformance/api/main.c

@@ -13,19 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
 
-// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h
+// FIXME: To use certain functions in harness/imageHelpers.h
 // (for example, generate_random_image_data()), the tests are required to declare
 // the following variables (<rdar://problem/11111245>):
 cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT;

test_conformance/api/procs.h

@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/clImageHelper.h"
-#include "../../test_common/harness/imageHelpers.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/clImageHelper.h"
+#include "harness/imageHelpers.h"
 extern float    calculate_ulperror(float a, float b);
 
 extern int        test_load_single_kernel(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

test_conformance/api/testBase.h

@@ -16,7 +16,7 @@
 #ifndef _testBase_h
 #define _testBase_h
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

test_conformance/api/test_api_min_max.c

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 #include <ctype.h>
 #include <string.h>
 

test_conformance/api/test_bool.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 
 const char *kernel_with_bool[] = {

test_conformance/api/test_clone_kernel.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 #include <sstream>
 #include <string>
 #include <cmath>

test_conformance/api/test_create_context_from_type.cpp

@@ -14,13 +14,13 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #ifndef _WIN32
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_create_kernels.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 
 const char *sample_single_kernel[] = {

test_conformance/api/test_device_min_data_type_align_size_alignment.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #ifndef _WIN32
 #include <unistd.h>
 #endif

test_conformance/api/test_kernel_arg_multi_setup.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 // This test is designed to stress passing multiple vector parameters to kernels and verifying access between them all
 

test_conformance/api/test_kernels.c

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_mem_object_info.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_native_kernel.cpp

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_null_buffer_arg.c

@@ -22,8 +22,8 @@
 #include <CL/cl_platform.h>
 #endif
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 #include "procs.h"
 
 

test_conformance/api/test_queries.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/imageHelpers.h"
+#include "harness/imageHelpers.h"
 #include <stdlib.h>
 #include <ctype.h>
 

test_conformance/api/test_queue_hint.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 #include <sstream>
 #include <string>
 

test_conformance/api/test_retain_program.c

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 int test_release_kernel_order(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
 {

test_conformance/api/test_sub_group_dispatch.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 
 const char *subgroup_dispatch_kernel[] = {
 "__kernel void subgroup_dispatch_kernel(__global int *output)\n"

test_conformance/api/test_zero_sized_enqueue.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 
 const char *zero_sized_enqueue_test_kernel[] = {
 "__kernel void foo_kernel(__global float *src, __global int *dst)\n"