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

Side by Side Diff: net/net.gyp

Issue 1093993003: Allow embedded_test_server to serve from multiple directories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix iOS Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 }, 353 },
354 ], 354 ],
355 [ 'OS == "ios"', { 355 [ 'OS == "ios"', {
356 'actions': [ 356 'actions': [
357 { 357 {
358 'action_name': 'copy_test_data', 358 'action_name': 'copy_test_data',
359 'variables': { 359 'variables': {
360 'test_data_files': [ 360 'test_data_files': [
361 'data/ssl/certificates/', 361 'data/ssl/certificates/',
362 'data/test.html', 362 'data/test.html',
363 'data/embedded_test_server/',
363 'data/url_request_unittest/', 364 'data/url_request_unittest/',
364 ], 365 ],
365 'test_data_prefix': 'net', 366 'test_data_prefix': 'net',
366 }, 367 },
367 'includes': [ '../build/copy_test_data_ios.gypi' ], 368 'includes': [ '../build/copy_test_data_ios.gypi' ],
368 }, 369 },
369 ], 370 ],
370 'sources!': [ 371 'sources!': [
371 # TODO(droger): The following tests are disabled because the 372 # TODO(droger): The following tests are disabled because the
372 # implementation is missing or incomplete. 373 # implementation is missing or incomplete.
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 '../build/isolate.gypi', 1528 '../build/isolate.gypi',
1528 ], 1529 ],
1529 'sources': [ 1530 'sources': [
1530 'net_unittests.isolate', 1531 'net_unittests.isolate',
1531 ], 1532 ],
1532 }, 1533 },
1533 ], 1534 ],
1534 }], 1535 }],
1535 ], 1536 ],
1536 } 1537 }
OLDNEW
« no previous file with comments | « net/data/embedded_test_server/test2.html ('k') | net/test/embedded_test_server/embedded_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698