Skip to content

test: refactor header inclusion to speed up building (for test/server/...)#12045

Merged
junr03 merged 3 commits intoenvoyproxy:masterfrom
foreseeable:re_test_server
Jul 14, 2020
Merged

test: refactor header inclusion to speed up building (for test/server/...)#12045
junr03 merged 3 commits intoenvoyproxy:masterfrom
foreseeable:re_test_server

Conversation

@foreseeable
Copy link
Contributor

@foreseeable foreseeable commented Jul 13, 2020

Signed-off-by: Muge Chen mugechen@google.com

Refactor mock class include directive after dividing test/server/mocks.h (#11649)

Since the refactoring affects ~100 files so I split it up to several pull requests (previous one #11952)

Building time comparison for affected tests: see spreadsheet at #10917 comment

Commit Message: refactor header inclusion to speed up building
Additional Description:
Risk Level: low
Testing: exsiting tests
Docs Changes: N/A
Release Notes: no
Related Issues: #10917

\cc @ahedberg @bbarenblat

Signed-off-by: Muge Chen <mugechen@google.com>
@foreseeable foreseeable changed the title refactor dependencies test: refactor header inclusion to speed up building Jul 13, 2020
Copy link
Contributor

@ahedberg ahedberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me assuming CI comes back clean.

Can you try to merge upstream into this PR? The following should work (note, don't rebase, or that makes the diff hard to read):

# Update your local versions of the upstream branches
git fetch upstream
git checkout <feature-name>
# Apply missing changes on upstream/master to your local master
git merge upstream/master

Signed-off-by: Muge Chen <mugechen@google.com>
@foreseeable foreseeable changed the title test: refactor header inclusion to speed up building test: refactor header for test/server/... inclusion to speed up building Jul 14, 2020
@foreseeable foreseeable changed the title test: refactor header for test/server/... inclusion to speed up building test: refactor header inclusion to speed up building (for test/server/...) Jul 14, 2020
@foreseeable
Copy link
Contributor Author

Looks good to me assuming CI comes back clean.

Can you try to merge upstream into this PR? The following should work (note, don't rebase, or that makes the diff hard to read):

# Update your local versions of the upstream branches
git fetch upstream
git checkout <feature-name>
# Apply missing changes on upstream/master to your local master
git merge upstream/master

I merged it, now the conflicts has been resolved. But the CI still fails. It seems failed on some flaky tests.

Signed-off-by: Muge Chen <mugechen@google.com>
@junr03 junr03 self-assigned this Jul 14, 2020
@junr03 junr03 merged commit 7d2ed85 into envoyproxy:master Jul 14, 2020
scheler pushed a commit to scheler/envoy that referenced this pull request Aug 4, 2020
…/...) (envoyproxy#12045)

Commit Message: refactor header inclusion to speed up building (for test/server/...)
Additional Description:
Risk Level: low
Testing: existing tests
Docs Changes: N/A
Release Notes: no
Related Issues: envoyproxy#10917

Signed-off-by: Muge Chen <mugechen@google.com>
Signed-off-by: scheler <santosh.cheler@appdynamics.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants