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

Contributes to #395. Signed-off-by: Kevin Petit <kevin.petit@arm.com>
2026-03-21 06:49:02 +00:00 · 2019-08-01 12:54:59 +01:00
parent 9148b1648a
commit 45129878ab
150 changed files with 354 additions and 357 deletions
--- a/test_conformance/basic/main.c
+++ b/test_conformance/basic/main.c
@@ -26,7 +26,7 @@

 #include <math.h>
 #include <string.h>
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #include "procs.h"

 basefn    basefn_list[] = {
--- a/test_conformance/basic/procs.h
+++ b/test_conformance/basic/procs.h
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/kernelHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/rounding_mode.h"

 extern void     memset_pattern4(void *dest, const void *src_pattern, size_t bytes );

--- a/test_conformance/basic/test_astype.cpp
+++ b/test_conformance/basic/test_astype.cpp
@@ -33,8 +33,8 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"


 static const char *astype_kernel_pattern =
--- a/test_conformance/basic/test_async_copy.cpp
+++ b/test_conformance/basic/test_async_copy.cpp
@@ -28,7 +28,7 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"

 static const char *async_global_to_local_kernel =
 "%s\n" // optional pragma string
--- a/test_conformance/basic/test_async_strided_copy.cpp
+++ b/test_conformance/basic/test_async_strided_copy.cpp
@@ -28,7 +28,7 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"

 static const char *async_strided_global_to_local_kernel =
 "%s\n" // optional pragma string
--- a/test_conformance/basic/test_enqueue_map.cpp
+++ b/test_conformance/basic/test_enqueue_map.cpp
@@ -27,8 +27,8 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"

 const cl_mem_flags flag_set[] = {
  CL_MEM_ALLOC_HOST_PTR,
--- a/test_conformance/basic/test_explicit_s2v.cpp
+++ b/test_conformance/basic/test_explicit_s2v.cpp
@@ -27,8 +27,8 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"

 #define DECLARE_S2V_IDENT_KERNEL(srctype,dsttype,size) \
 "__kernel void test_conversion(__global " srctype " *sourceValues, __global " dsttype #size " *destValues )\n"        \
--- a/test_conformance/basic/test_fpmath_float.c
+++ b/test_conformance/basic/test_fpmath_float.c
@@ -24,7 +24,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"

 #include "procs.h"

--- a/test_conformance/basic/test_fpmath_float2.c
+++ b/test_conformance/basic/test_fpmath_float2.c
@@ -24,7 +24,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"


 #include "procs.h"
--- a/test_conformance/basic/test_fpmath_float4.c
+++ b/test_conformance/basic/test_fpmath_float4.c
@@ -27,7 +27,7 @@


 #include "procs.h"
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"

 const char *fpadd4_kernel_code =
 "__kernel void test_fpadd4(__global float4 *srcA, __global float4 *srcB, __global float4 *dst)\n"
--- a/test_conformance/basic/test_image_param.c
+++ b/test_conformance/basic/test_image_param.c
@@ -27,9 +27,9 @@


 #include "procs.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/imageHelpers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/imageHelpers.h"
+#include "harness/conversions.h"


 static const char *param_kernel[] = {
--- a/test_conformance/basic/test_kernel_memory_alignment.cpp
+++ b/test_conformance/basic/test_kernel_memory_alignment.cpp
@@ -18,9 +18,9 @@
 #endif

 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"

 // For global, local, and constant
 const char *parameter_kernel_long =
--- a/test_conformance/basic/test_vec_type_hint.c
+++ b/test_conformance/basic/test_vec_type_hint.c
@@ -25,8 +25,8 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"


 static const char *sample_kernel = {
--- a/test_conformance/basic/test_vector_creation.cpp
+++ b/test_conformance/basic/test_vector_creation.cpp
@@ -14,9 +14,9 @@
 // limitations under the License.
 //
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"



--- a/test_conformance/basic/test_vloadstore.c
+++ b/test_conformance/basic/test_vloadstore.c
@@ -33,9 +33,9 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"

 // Outputs debug information for stores
 #define DEBUG 0
--- a/test_conformance/basic/test_work_item_functions.cpp
+++ b/test_conformance/basic/test_work_item_functions.cpp
@@ -27,8 +27,8 @@


 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"

 typedef struct work_item_data
 {