Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2915)

Unified Diff: chrome/chrome_tests.gypi

Issue 11971025: [sync] Divorce python sync test server chromiumsync.py from testserver.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.h ('k') | chrome/test/functional/PYAUTO_TESTS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a7d7cce06e08e562553326030588cfc567f5f6f8..1aff68500c04f24402a70a89880d1e17bc93aaab 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
@@ -1984,10 +1984,10 @@
'renderer',
'test_support_common',
'../net/net.gyp:net',
- '../net/net.gyp:net_test_support',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync_notifier',
+ '../sync/sync.gyp:test_support_sync_testserver',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
@@ -2149,6 +2149,7 @@
'test_support_common',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync_notifier',
+ '../sync/sync.gyp:test_support_sync_testserver',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
],
@@ -2208,7 +2209,7 @@
],
}],
['OS=="mac"', {
- # The sync_integration_tests do not run on mac without this flag.
+ # The sync_performance_tests do not run on mac without this flag.
# Search for comments about "xcode_settings" elsewhere in this file.
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
}],
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.h ('k') | chrome/test/functional/PYAUTO_TESTS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698