summaryrefslogtreecommitdiffstats
path: root/components/sessions
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2014-11-20 17:11:40 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-21 01:12:06 +0000
commite32e07d41933eb2fb7c368d8c67ab26bfd3dfa78 (patch)
tree2b7fee2b308d9d14812f043ab3d0d7a7d24f8963 /components/sessions
parentff7a801dfddaa22643accaf3e0df192470fb7a7b (diff)
downloadchromium_src-e32e07d41933eb2fb7c368d8c67ab26bfd3dfa78.zip
chromium_src-e32e07d41933eb2fb7c368d8c67ab26bfd3dfa78.tar.gz
chromium_src-e32e07d41933eb2fb7c368d8c67ab26bfd3dfa78.tar.bz2
Add chrome sync tests to the GN build.
This adds sync_integration_tests, sync_performance_tests, and the sync test support targets. I removed some files that were duplicated between the sync integration tests and the test support. In GYP the fact that test support was a static library hid the duplicate symbols. Add a dependency on sessions_core from sessions test support since it's required to link. Made test support target be a source set (linking source sets into static libraries will often duplicate symbols). Reland of https://crrev.com/d60468061789084ebd98458b9743726cc1541786 with fix. TBR=scottmg Review URL: https://codereview.chromium.org/743133004 Cr-Commit-Position: refs/heads/master@{#305132}
Diffstat (limited to 'components/sessions')
-rw-r--r--components/sessions/BUILD.gn3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index be2aec2..d5ecde2 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -48,7 +48,7 @@ source_set("sessions_core") {
}
}
-static_library("test_support") {
+source_set("test_support") {
testonly = true
sources = [
"serialized_navigation_entry_test_helper.cc",
@@ -56,6 +56,7 @@ static_library("test_support") {
]
deps = [
+ ":sessions_core",
"//skia",
"//testing/gtest",
]