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

Side by Side Diff: chrome/test/data/nacl/nacl_test_data.gyp

Issue 11360223: Revert "Add support in NaCl browser tests for testing pnacl-translated nexes" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # 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
4 # found in the LICENSE file. 3 # found in the LICENSE file.
5 4
6 { 5 {
7 'includes': [ 6 'includes': [
8 'nacl_browser_test.gypi', 7 'nacl_browser_test.gypi',
9 ], 8 ],
10 'targets': [ 9 'targets': [
11 { 10 {
12 'target_name': 'shared_test_files', 11 'target_name': 'shared_test_files',
13 'type': 'none', 12 'type': 'none',
14 'variables': { 13 'variables': {
15 'build_newlib': 1, 14 'build_newlib': 1,
16 'build_glibc': 1, 15 'build_glibc': 1,
17 'build_pnacl_newlib': 1,
18 'test_files': [ 16 'test_files': [
19 # TODO(ncbray) move into chrome/test/data/nacl when all tests are 17 # TODO(ncbray) move into chrome/test/data/nacl when all tests are
20 # converted. 18 # converted.
21 '<(DEPTH)/ppapi/native_client/tests/ppapi_browser/progress_event_liste ner.js', 19 '<(DEPTH)/ppapi/native_client/tests/ppapi_browser/progress_event_liste ner.js',
22 '<(DEPTH)/ppapi/native_client/tools/browser_tester/browserdata/nacltes t.js', 20 '<(DEPTH)/ppapi/native_client/tools/browser_tester/browserdata/nacltes t.js',
23 ], 21 ],
24 }, 22 },
25 }, 23 },
26 { 24 {
27 'target_name': 'simple_test', 25 'target_name': 'simple_test',
28 'type': 'none', 26 'type': 'none',
29 'variables': { 27 'variables': {
30 'nexe_target': 'simple', 28 'nexe_target': 'simple',
31 'build_newlib': 1, 29 'build_newlib': 1,
32 'build_glibc': 1, 30 'build_glibc': 1,
33 'build_pnacl_newlib': 1,
34 'sources': [ 31 'sources': [
35 'simple.cc', 32 'simple.cc',
36 ], 33 ],
37 'test_files': [ 34 'test_files': [
38 'nacl_load_test.html', 35 'nacl_load_test.html',
39 ], 36 ],
40 }, 37 },
41 }, 38 },
42 { 39 {
43 'target_name': 'exit_status_test', 40 'target_name': 'exit_status_test',
44 'type': 'none', 41 'type': 'none',
45 'variables': { 42 'variables': {
46 'nexe_target': 'pm_exit_status_test', 43 'nexe_target': 'pm_exit_status_test',
47 'build_newlib': 1, 44 'build_newlib': 1,
48 'build_glibc': 1, 45 'build_glibc': 1,
49 'build_pnacl_newlib': 1,
50 'sources': [ 46 'sources': [
51 'exit_status/pm_exit_status_test.cc', 47 'exit_status/pm_exit_status_test.cc',
52 ], 48 ],
53 'test_files': [ 49 'test_files': [
54 'exit_status/pm_exit_status_test.html', 50 'exit_status/pm_exit_status_test.html',
55 ], 51 ],
56 }, 52 },
57 }, 53 },
58 { 54 {
59 'target_name': 'ppapi_test_lib', 55 'target_name': 'ppapi_test_lib',
60 'type': 'none', 56 'type': 'none',
61 'variables': { 57 'variables': {
62 'nlib_target': 'libppapi_test_lib.a', 58 'nlib_target': 'libppapi_test_lib.a',
63 'nso_target': 'libppapi_test_lib.so', 59 'nso_target': 'libppapi_test_lib.so',
64 'build_newlib': 1, 60 'build_newlib': 1,
65 'build_glibc': 1, 61 'build_glibc': 1,
66 'build_pnacl_newlib': 1,
67 'sources': [ 62 'sources': [
68 # TODO(ncbray) move these files once SCons no longer depends on them. 63 # TODO(ncbray) move these files once SCons no longer depends on them.
69 '../../../../ppapi/native_client/tests/ppapi_test_lib/get_browser_inte rface.cc', 64 '../../../../ppapi/native_client/tests/ppapi_test_lib/get_browser_inte rface.cc',
70 '../../../../ppapi/native_client/tests/ppapi_test_lib/internal_utils.c c', 65 '../../../../ppapi/native_client/tests/ppapi_test_lib/internal_utils.c c',
71 '../../../../ppapi/native_client/tests/ppapi_test_lib/module_instance. cc', 66 '../../../../ppapi/native_client/tests/ppapi_test_lib/module_instance. cc',
72 '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callbac k.cc', 67 '../../../../ppapi/native_client/tests/ppapi_test_lib/testable_callbac k.cc',
73 '../../../../ppapi/native_client/tests/ppapi_test_lib/test_interface.c c', 68 '../../../../ppapi/native_client/tests/ppapi_test_lib/test_interface.c c',
74 ] 69 ]
75 }, 70 },
76 'dependencies': [ 71 'dependencies': [
77 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 72 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
78 ], 73 ],
79 }, 74 },
80 { 75 {
81 'target_name': 'ppapi_progress_events', 76 'target_name': 'ppapi_progress_events',
82 'type': 'none', 77 'type': 'none',
83 'variables': { 78 'variables': {
84 'nexe_target': 'ppapi_progress_events', 79 'nexe_target': 'ppapi_progress_events',
85 'build_newlib': 1, 80 'build_newlib': 1,
86 'build_glibc': 1, 81 'build_glibc': 1,
87 'build_pnacl_newlib': 1,
88 'link_flags': [ 82 'link_flags': [
89 '-lppapi', 83 '-lppapi',
90 '-lppapi_test_lib', 84 '-lppapi_test_lib',
91 '-lplatform', 85 '-lplatform',
92 '-lgio', 86 '-lgio',
93 ], 87 ],
94 'sources': [ 88 'sources': [
95 'progress_events/ppapi_progress_events.cc', 89 'progress_events/ppapi_progress_events.cc',
96 ], 90 ],
97 'test_files': [ 91 'test_files': [
(...skipping 10 matching lines...) Expand all
108 ], 102 ],
109 }, 103 },
110 # Legacy NaCl PPAPI interface tests being here. 104 # Legacy NaCl PPAPI interface tests being here.
111 { 105 {
112 'target_name': 'ppapi_ppb_core', 106 'target_name': 'ppapi_ppb_core',
113 'type': 'none', 107 'type': 'none',
114 'variables': { 108 'variables': {
115 'nexe_target': 'ppapi_ppb_core', 109 'nexe_target': 'ppapi_ppb_core',
116 'build_newlib': 1, 110 'build_newlib': 1,
117 'build_glibc': 1, 111 'build_glibc': 1,
118 'build_pnacl_newlib': 1,
119 'link_flags': [ 112 'link_flags': [
120 '-lppapi', 113 '-lppapi',
121 '-lppapi_test_lib', 114 '-lppapi_test_lib',
122 '-lplatform', 115 '-lplatform',
123 '-lgio', 116 '-lgio',
124 ], 117 ],
125 'sources': [ 118 'sources': [
126 'ppapi/ppb_core/ppapi_ppb_core.cc', 119 'ppapi/ppb_core/ppapi_ppb_core.cc',
127 ], 120 ],
128 'test_files': [ 121 'test_files': [
129 'ppapi/ppb_core/ppapi_ppb_core.html', 122 'ppapi/ppb_core/ppapi_ppb_core.html',
130 ], 123 ],
131 }, 124 },
132 'dependencies': [ 125 'dependencies': [
133 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 126 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
134 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 127 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
135 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 128 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
136 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 129 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
137 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', 130 '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
138 'ppapi_test_lib', 131 'ppapi_test_lib',
139 ], 132 ],
140 }, 133 },
141 ], 134 ],
142 } 135 }
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698