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/296480Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Make unittest #includes start from src
2728f992 · Corentin Wallez · 89bb70e9 · 2728f992 · 2728f992 · 2728f992
Commit 2728f992 authored Aug 31, 2015 by Corentin Wallez
22 changed files
--- 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;

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

--- 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':
    [

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

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

--- 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)
 {

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

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

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

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

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

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

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


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

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

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

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


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

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

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

--- 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)
 {

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