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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7831053: Move NaCl tests out of chrome/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | « build/all.gyp ('k') | chrome/test/nacl/nacl_sandbox_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 100205)
+++ chrome/chrome_tests.gypi (working copy)
@@ -1039,186 +1039,6 @@
],
},
{
- 'target_name': 'nacl_security_tests',
- 'type': 'shared_library',
- 'include_dirs': [
- '..'
- ],
- 'sources': [
- # mostly OS dependent files below...
- ],
- 'conditions': [
- ['OS=="mac"', {
- # Only the Mac version uses gtest (linking issues on other platforms).
- 'dependencies': [
- '../testing/gtest.gyp:gtest'
- ],
- 'sources': [
- 'test/nacl_security_tests/commands_posix.cc',
- 'test/nacl_security_tests/commands_posix.h',
- 'test/nacl_security_tests/nacl_security_tests_posix.h',
- 'test/nacl_security_tests/nacl_security_tests_mac.cc',
- ],
- 'xcode_settings': {
- 'DYLIB_INSTALL_NAME_BASE': '@executable_path/',
- },
- },],
- ['OS=="linux"', {
- 'sources': [
- 'test/nacl_security_tests/commands_posix.cc',
- 'test/nacl_security_tests/commands_posix.h',
- 'test/nacl_security_tests/nacl_security_tests_posix.h',
- 'test/nacl_security_tests/nacl_security_tests_linux.cc',
- ],
- },],
- ['OS=="win"', {
- 'sources': [
- '../sandbox/tests/validation_tests/commands.cc',
- '../sandbox/tests/validation_tests/commands.h',
- '../sandbox/tests/common/controller.h',
- 'test/nacl_security_tests/nacl_security_tests_win.h',
- 'test/nacl_security_tests/nacl_security_tests_win.cc',
- ],
- },],
- # Set fPIC in case it isn't set.
- ['os_posix == 1 and OS != "mac"'
- 'and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
- 'cflags': ['-fPIC'],
- },],
- ],
- },
- {
- 'target_name': 'nacl_sandbox_tests',
- 'type': 'executable',
- 'dependencies': [
- 'chrome',
- 'browser',
- 'common',
- 'chrome_resources',
- 'chrome_strings',
- 'test_support_ui',
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- '../third_party/libxml/libxml.gyp:libxml',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/nacl/nacl_test.cc',
- 'test/nacl/nacl_sandbox_test.cc'
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'chrome_nacl_win64',
- 'nacl_security_tests', # run time dependency
- 'nacl_security_tests64', # run time dependency
- 'test_support_common',
- '../google_update/google_update.gyp:google_update',
- '../views/views.gyp:views',
- # run time dependency
- '../webkit/webkit.gyp:copy_npapi_test_plugin',
- ],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
- 'link_settings': {
- 'libraries': [
- '-lOleAcc.lib',
- ],
- },
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
- },
- },
- },
- },
- }],
- ['OS=="mac"', {
- 'dependencies': [
- 'nacl_security_tests', # run time dependency
- ],
- }],
- ],
- },
- {
- 'target_name': 'nacl_ui_tests',
- 'type': 'executable',
- 'dependencies': [
- 'chrome',
- 'browser',
- 'common',
- 'chrome_resources',
- 'chrome_strings',
- 'test_support_ui',
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/nacl/nacl_test.cc',
- 'test/nacl/nacl_ui_test.cc',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'chrome_nacl_win64',
- 'security_tests', # run time dependency
- 'test_support_common',
- '../google_update/google_update.gyp:google_update',
- # run time dependency
- '../webkit/webkit.gyp:copy_npapi_test_plugin',
- ],
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
- 'link_settings': {
- 'libraries': [
- '-lOleAcc.lib',
- ],
- },
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
- },
- },
- },
- },
- }],
- ['toolkit_views==1', {
- 'dependencies': [
- '../views/views.gyp:views',
- ],
- }],
- ],
- },
- {
'target_name': 'unit_tests',
'type': 'executable',
'dependencies': [
@@ -3805,26 +3625,6 @@
'../sandbox/tests/validation_tests/commands.h',
],
},
- # Extra 64-bit DLL for windows
- {
- 'target_name': 'nacl_security_tests64',
- 'type': 'shared_library',
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- 'include_dirs': [
- '..'
- ],
- 'sources': [
- '../sandbox/tests/validation_tests/commands.cc',
- '../sandbox/tests/validation_tests/commands.h',
- '../sandbox/tests/common/controller.h',
- 'test/nacl_security_tests/nacl_security_tests_win.h',
- 'test/nacl_security_tests/nacl_security_tests_win.cc',
- ],
- },
]}, # 'targets'
], # OS=="win"
# If you change this condition, make sure you also change it in all.gyp
« no previous file with comments | « build/all.gyp ('k') | chrome/test/nacl/nacl_sandbox_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698