summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 21:38:11 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 21:38:11 +0000
commitb0ae8e0a0298364fb5125dde17e50b4e1751696d (patch)
tree289fb19e25c2fd8b12733962890f4d8c8ae1c4b3 /chrome/chrome_tests.gypi
parentdc8373df869625617394cfe6790d2035852937b5 (diff)
downloadchromium_src-b0ae8e0a0298364fb5125dde17e50b4e1751696d.zip
chromium_src-b0ae8e0a0298364fb5125dde17e50b4e1751696d.tar.gz
chromium_src-b0ae8e0a0298364fb5125dde17e50b4e1751696d.tar.bz2
Remove obsolete NaCl tests.
BUG=90905, 89352 Review URL: http://codereview.chromium.org/7831053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi200
1 files changed, 0 insertions, 200 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e991e90..b4895f9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -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': [
@@ -3806,26 +3626,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