Make unittest #includes start from src
This is will help avoid adding many include directories for the GN
build.
BUG=angleproject:929
Change-Id: If8f7e98526df3560b8e410ec86271a2da0c6889d
Reviewed-on: https://chromium-review.googlesource.com/296480
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/libANGLE/Program_unittest.cpp b/src/libANGLE/Program_unittest.cpp
index 575b44c..78b9a80 100644
--- a/src/libANGLE/Program_unittest.cpp
+++ b/src/libANGLE/Program_unittest.cpp
@@ -8,7 +8,7 @@
#include <gtest/gtest.h>
-#include "angle_unittests_utils.h"
+#include "tests/angle_unittests_utils.h"
#include "libANGLE/Program.h"
using namespace gl;
diff --git a/src/libANGLE/ResourceManager_unittest.cpp b/src/libANGLE/ResourceManager_unittest.cpp
index 589bda9..d6ddeaf 100644
--- a/src/libANGLE/ResourceManager_unittest.cpp
+++ b/src/libANGLE/ResourceManager_unittest.cpp
@@ -9,7 +9,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "angle_unittests_utils.h"
+#include "tests/angle_unittests_utils.h"
#include "libANGLE/ResourceManager.h"
using namespace rx;
diff --git a/src/tests/angle_unittests.gypi b/src/tests/angle_unittests.gypi
index 3901899..dc17026 100644
--- a/src/tests/angle_unittests.gypi
+++ b/src/tests/angle_unittests.gypi
@@ -88,8 +88,6 @@
[
'<(angle_path)/include',
'<(angle_path)/src',
- '<(angle_path)/src/compiler/preprocessor',
- '<(angle_path)/src/tests',
],
'sources':
[
diff --git a/src/tests/preprocessor_tests/MockDiagnostics.h b/src/tests/preprocessor_tests/MockDiagnostics.h
index 1fcedb4..3976178 100644
--- a/src/tests/preprocessor_tests/MockDiagnostics.h
+++ b/src/tests/preprocessor_tests/MockDiagnostics.h
@@ -8,7 +8,7 @@
#define PREPROCESSOR_TESTS_MOCK_DIAGNOSTICS_H_
#include "gmock/gmock.h"
-#include "DiagnosticsBase.h"
+#include "compiler/preprocessor/DiagnosticsBase.h"
class MockDiagnostics : public pp::Diagnostics
{
diff --git a/src/tests/preprocessor_tests/MockDirectiveHandler.h b/src/tests/preprocessor_tests/MockDirectiveHandler.h
index 3753f15..7560add 100644
--- a/src/tests/preprocessor_tests/MockDirectiveHandler.h
+++ b/src/tests/preprocessor_tests/MockDirectiveHandler.h
@@ -8,7 +8,7 @@
#define PREPROCESSOR_TESTS_MOCK_DIRECTIVE_HANDLER_H_
#include "gmock/gmock.h"
-#include "DirectiveHandlerBase.h"
+#include "compiler/preprocessor/DirectiveHandlerBase.h"
class MockDirectiveHandler : public pp::DirectiveHandler
{
diff --git a/src/tests/preprocessor_tests/PreprocessorTest.cpp b/src/tests/preprocessor_tests/PreprocessorTest.cpp
index 9f90484..b4acd28 100644
--- a/src/tests/preprocessor_tests/PreprocessorTest.cpp
+++ b/src/tests/preprocessor_tests/PreprocessorTest.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
void PreprocessorTest::preprocess(const char* input, const char* expected)
{
diff --git a/src/tests/preprocessor_tests/PreprocessorTest.h b/src/tests/preprocessor_tests/PreprocessorTest.h
index e8184de..e270f12 100644
--- a/src/tests/preprocessor_tests/PreprocessorTest.h
+++ b/src/tests/preprocessor_tests/PreprocessorTest.h
@@ -8,7 +8,7 @@
#include "MockDiagnostics.h"
#include "MockDirectiveHandler.h"
-#include "Preprocessor.h"
+#include "compiler/preprocessor/Preprocessor.h"
#ifndef PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
#define PREPROCESSOR_TESTS_PREPROCESSOR_TEST_H_
diff --git a/src/tests/preprocessor_tests/char_test.cpp b/src/tests/preprocessor_tests/char_test.cpp
index bd1871d..641ef2c 100644
--- a/src/tests/preprocessor_tests/char_test.cpp
+++ b/src/tests/preprocessor_tests/char_test.cpp
@@ -8,7 +8,7 @@
#include <climits>
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class CharTest : public PreprocessorTest,
public testing::WithParamInterface<int>
diff --git a/src/tests/preprocessor_tests/comment_test.cpp b/src/tests/preprocessor_tests/comment_test.cpp
index f0a2814..d3712ea 100644
--- a/src/tests/preprocessor_tests/comment_test.cpp
+++ b/src/tests/preprocessor_tests/comment_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class CommentTest : public PreprocessorTest,
public testing::WithParamInterface<const char*>
diff --git a/src/tests/preprocessor_tests/define_test.cpp b/src/tests/preprocessor_tests/define_test.cpp
index fd3ae41..f06a85f 100644
--- a/src/tests/preprocessor_tests/define_test.cpp
+++ b/src/tests/preprocessor_tests/define_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class DefineTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/error_test.cpp b/src/tests/preprocessor_tests/error_test.cpp
index ac7cdba..f0cf8af 100644
--- a/src/tests/preprocessor_tests/error_test.cpp
+++ b/src/tests/preprocessor_tests/error_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class ErrorTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/extension_test.cpp b/src/tests/preprocessor_tests/extension_test.cpp
index 6a819d1..468ca49 100644
--- a/src/tests/preprocessor_tests/extension_test.cpp
+++ b/src/tests/preprocessor_tests/extension_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class ExtensionTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/identifier_test.cpp b/src/tests/preprocessor_tests/identifier_test.cpp
index 6b8f87e..4712b38 100644
--- a/src/tests/preprocessor_tests/identifier_test.cpp
+++ b/src/tests/preprocessor_tests/identifier_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
#define CLOSED_RANGE(x, y) testing::Range(x, static_cast<char>((y) + 1))
diff --git a/src/tests/preprocessor_tests/if_test.cpp b/src/tests/preprocessor_tests/if_test.cpp
index 2849887..32b7d41 100644
--- a/src/tests/preprocessor_tests/if_test.cpp
+++ b/src/tests/preprocessor_tests/if_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class IfTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/input_test.cpp b/src/tests/preprocessor_tests/input_test.cpp
index 0526c4a..ca1878c 100644
--- a/src/tests/preprocessor_tests/input_test.cpp
+++ b/src/tests/preprocessor_tests/input_test.cpp
@@ -5,8 +5,8 @@
//
#include "PreprocessorTest.h"
-#include "Input.h"
-#include "Token.h"
+#include "compiler/preprocessor/Input.h"
+#include "compiler/preprocessor/Token.h"
class InitTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/location_test.cpp b/src/tests/preprocessor_tests/location_test.cpp
index eb81555..e8f41a4 100644
--- a/src/tests/preprocessor_tests/location_test.cpp
+++ b/src/tests/preprocessor_tests/location_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class LocationTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/number_test.cpp b/src/tests/preprocessor_tests/number_test.cpp
index 9b2518b..4e295d3 100644
--- a/src/tests/preprocessor_tests/number_test.cpp
+++ b/src/tests/preprocessor_tests/number_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
#define CLOSED_RANGE(x, y) testing::Range(x, static_cast<char>((y) + 1))
diff --git a/src/tests/preprocessor_tests/operator_test.cpp b/src/tests/preprocessor_tests/operator_test.cpp
index d73bec6..505cbe3 100644
--- a/src/tests/preprocessor_tests/operator_test.cpp
+++ b/src/tests/preprocessor_tests/operator_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
struct OperatorTestParam
{
diff --git a/src/tests/preprocessor_tests/pragma_test.cpp b/src/tests/preprocessor_tests/pragma_test.cpp
index 25db7c7..92992ac 100644
--- a/src/tests/preprocessor_tests/pragma_test.cpp
+++ b/src/tests/preprocessor_tests/pragma_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class PragmaTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/space_test.cpp b/src/tests/preprocessor_tests/space_test.cpp
index c6b70c5..0c3494b 100644
--- a/src/tests/preprocessor_tests/space_test.cpp
+++ b/src/tests/preprocessor_tests/space_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class SpaceTest : public PreprocessorTest
{
diff --git a/src/tests/preprocessor_tests/token_test.cpp b/src/tests/preprocessor_tests/token_test.cpp
index 22898e7..106647c 100644
--- a/src/tests/preprocessor_tests/token_test.cpp
+++ b/src/tests/preprocessor_tests/token_test.cpp
@@ -6,7 +6,7 @@
#include "gtest/gtest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
TEST(TokenTest, DefaultConstructor)
{
diff --git a/src/tests/preprocessor_tests/version_test.cpp b/src/tests/preprocessor_tests/version_test.cpp
index 1c490e5..a38542d 100644
--- a/src/tests/preprocessor_tests/version_test.cpp
+++ b/src/tests/preprocessor_tests/version_test.cpp
@@ -5,7 +5,7 @@
//
#include "PreprocessorTest.h"
-#include "Token.h"
+#include "compiler/preprocessor/Token.h"
class VersionTest : public PreprocessorTest
{