summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_tests.gypi
diff options
context:
space:
mode:
authorglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 11:06:49 +0000
committerglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 11:06:49 +0000
commit8061860c171112229f3fc5c111c6c45c51d293fc (patch)
treeb8db391d1b38c28605f30617209b1a244036d1e5 /ppapi/ppapi_tests.gypi
parent9fcd474cac2e97c50c093a94e4cc70e0009c43e7 (diff)
downloadchromium_src-8061860c171112229f3fc5c111c6c45c51d293fc.zip
chromium_src-8061860c171112229f3fc5c111c6c45c51d293fc.tar.gz
chromium_src-8061860c171112229f3fc5c111c6c45c51d293fc.tar.bz2
Speculative Revert 108361 - in hope to fix Win Builder 2010
http://build.chromium.org/p/chromium/builders/Win%20Builder%202010%20%28dbg%29/builds/12897 This CL is based on the patch: http://codereview.chromium.org/8416025 Use GYP to build nacl_irt Converts Chrome from using scons to using GYP when building nacl_irt. This change causes chrome to use GYP based components for untrusted code. As a benifit, GYP will no longer need to run and scrape scons output to determine irt dependencies. This also allows us to avoid invoking scons during the build process. We roll NaCl deps to get a fix for a simultaneous 32/64 bit build issue on Windows. This broke the mac build due to a missing dependency where pthread.h was unavailable. This header gets copied to the correct location during the prep_toolchain action. I've added the appropriate dependency shown bellow to the original patch. This add the addition dependency to ppruntime 'dependencies': [ '<(DEPTH)/native_client/src/tools.gyp:prep_toolchain' ], TEST= try BUG= http://code.google.com/p/chromium/issues/detail?id=96782 Review URL: http://codereview.chromium.org/8440004 TBR=noelallen@google.com Review URL: http://codereview.chromium.org/8423080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_tests.gypi')
-rw-r--r--ppapi/ppapi_tests.gypi76
1 files changed, 0 insertions, 76 deletions
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index c2de235..352cfd1 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -261,82 +261,6 @@
],
'conditions': [
- ['disable_nacl!=1', {
- 'targets': [
- {
- 'target_name': 'ppapi_nacl_tests',
- 'type': 'none',
- 'dependencies': [
- 'native_client/native_client.gyp:nacl_irt',
- ],
- 'variables': {
- 'nexe_target': 'ppapi_nacl_tests',
- 'build_glibc': 0,
- 'build_newlib': 1,
- 'include_dirs': [
- 'lib/gl/include',
- '..',
- ],
- 'sources': [
- # Common test files
- 'tests/test_case.cc',
- 'tests/test_utils.cc',
- 'tests/testing_instance.cc',
-
- # Compile-time tests
- 'tests/test_c_includes.c',
- 'tests/test_cpp_includes.cc',
- 'tests/test_struct_sizes.c',
-
- # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
- # Add/uncomment PPAPI interfaces below when they get proxied.
- # Not yet proxied.
- #'test_broker.cc',
- # Not yet proxied.
- #'test_buffer.cc',
- # Not yet proxied.
- #'test_char_set.cc',
- 'tests/test_cursor_control.cc',
- # Fails in DeleteDirectoryRecursively.
- # BUG: http://code.google.com/p/nativeclient/issues/detail?id=2107
- #'test_directory_reader.cc',
- 'tests/test_file_io.cc',
- 'tests/test_file_ref.cc',
- 'tests/test_file_system.cc',
- 'tests/test_memory.cc',
- 'tests/test_graphics_2d.cc',
- 'tests/test_image_data.cc',
- 'tests/test_paint_aggregator.cc',
- # test_post_message.cc relies on synchronous scripting, which is not
- # available for untrusted tests.
- # Does not compile under nacl (uses private interface ExecuteScript).
- #'test_post_message.cc',
- 'tests/test_scrollbar.cc',
- # Not yet proxied.
- #'tests/test_transport.cc',
- # Not yet proxied.
- #'tests/test_uma.cc',
- # Activating the URL loader test requires a test httpd that
- # understands HTTP POST, which our current httpd.py doesn't.
- # It also requires deactivating the tests that use FileIOTrusted
- # when running in NaCl.
- #'tests/test_url_loader.cc',
- # Does not compile under nacl (uses VarPrivate).
- #'test_url_util.cc',
- # Not yet proxied.
- #'test_video_decoder.cc',
- 'tests/test_var.cc',
-
- # Deprecated test cases.
- #'tests/test_instance_deprecated.cc',
- # Var_deprecated fails in TestPassReference, and we probably won't
- # fix it.
- #'tests/test_var_deprecated.cc'
- ],
- },
- },
- ],
- }],
# NOTE: the PPAPI examples fail to build on mac & windows.
# http://code.google.com/p/chromium/issues/detail?id=54005 tracks mac.
['OS!="mac"', {