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

Fixes #395.

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

test_conformance/profiling/copy.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -21,9 +21,9 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/conversions.h"
 
 //--- the code for the kernel executables
 static const char *write_kernel_code =

test_conformance/profiling/execute.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -22,8 +22,8 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
 
 #ifndef uchar
 typedef unsigned char uchar;

test_conformance/profiling/execute_multipass.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -22,8 +22,8 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
 
 static const char *read3d_kernel_code =
 "\n"

test_conformance/profiling/main.c

@@ -13,14 +13,14 @@
 // 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 <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
-// 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/profiling/procs.h

@@ -16,10 +16,10 @@
 #ifndef __PROCS_H__
 #define __PROCS_H__
 
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/imageHelpers.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/imageHelpers.h"
+#include "harness/mt19937.h"
 
 
 extern int check_times(cl_ulong queueStart, cl_ulong submitStart, cl_ulong commandStart, cl_ulong commandEnd, cl_device_id device);

test_conformance/profiling/readArray.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #define TEST_PRIME_INT        ((1<<16)+1)
 #define TEST_PRIME_UINT        ((1U<<16)+1U)

test_conformance/profiling/readImage.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -21,8 +21,8 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
 
 //--- the code for the kernel executables
 static const char *readKernelCode[] = {

test_conformance/profiling/writeArray.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -21,9 +21,9 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/conversions.h"
 
 //#define USE_LOCAL_THREADS    1
 

test_conformance/profiling/writeImage.c

@@ -13,7 +13,7 @@
 // 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 <string.h>
@@ -21,8 +21,8 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
 
 //--- the code for the kernel executables
 static const char *readKernelCode[] = {