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

Fixes #395.

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

test_conformance/images/clCopyImage/main.cpp

@@ -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>
@@ -24,7 +24,7 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/testHarness.h"
+#include "../harness/testHarness.h"
 
 bool gDebugTrace;
 bool gTestSmallImages;

test_conformance/images/clFillImage/main.cpp

@@ -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>
@@ -24,7 +24,7 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/testHarness.h"
+#include "../harness/testHarness.h"
 
 bool gDebugTrace;
 bool gTestSmallImages;

test_conformance/images/clGetInfo/main.cpp

@@ -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>

test_conformance/images/clReadWriteImage/main.cpp

@@ -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>

test_conformance/images/kernel_image_methods/main.cpp

@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../../test_common/harness/compat.h"
-#include "../../../test_common/harness/parseParameters.h"
+#include "../harness/compat.h"
+#include "../harness/parseParameters.h"
 
 #include <stdio.h>
 #include <string.h>

test_conformance/images/kernel_read_write/main.cpp

@@ -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>
@@ -24,8 +24,8 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/fpcontrol.h"
-#include "../../../test_common/harness/parseParameters.h"
+#include "../harness/fpcontrol.h"
+#include "../harness/parseParameters.h"
 
 #include <vector>
 

test_conformance/images/samplerlessReads/main.cpp

@@ -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>
@@ -24,8 +24,8 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/fpcontrol.h"
-#include "../../../test_common/harness/parseParameters.h"
+#include "../harness/fpcontrol.h"
+#include "../harness/parseParameters.h"
 
 #if defined(__PPC__)
 // Global varaiable used to hold the FPU control register state. The FPSCR register can not

test_conformance/images/testBase.h

@@ -16,11 +16,11 @@
 #ifndef _testBase_h
 #define _testBase_h
 
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/clImageHelper.h"
-#include "../../test_common/harness/imageHelpers.h"
+#include "harness/compat.h"
+#include "harness/testHarness.h"
+#include "harness/kernelHelpers.h"
+#include "harness/clImageHelper.h"
+#include "harness/imageHelpers.h"
 
 // Amount to offset pixels for checking normalized reads
 #define NORM_OFFSET 0.1f