| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="linux"', { | 6 ['OS=="linux"', { |
| 7 'variables': { | 7 'variables': { |
| 8 'command': [ | 8 'command': [ |
| 9 '../testing/xvfb.py', | 9 '../testing/xvfb.py', |
| 10 '<(PRODUCT_DIR)', | 10 '<(PRODUCT_DIR)', |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 }], | 100 }], |
| 101 [('disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and ' | 101 [('disable_nacl==0 and (OS=="linux" or OS=="mac" or OS=="win") and ' |
| 102 '(target_arch=="x64" or target_arch=="ia32")'), { | 102 '(target_arch=="x64" or target_arch=="ia32")'), { |
| 103 'variables': { | 103 'variables': { |
| 104 'files': [ | 104 'files': [ |
| 105 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', | 105 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', |
| 106 ], | 106 ], |
| 107 }, | 107 }, |
| 108 }], | 108 }], |
| 109 [('disable_nacl==0 and OS=="linux" and ' | 109 [('disable_nacl==0 and OS=="linux" and ' |
| 110 '(target_arch=="ia32" or target_arch=="arm")'), { | 110 '(target_arch=="ia32" or target_arch=="x64" or target_arch=="arm")'), { |
| 111 'variables': { | 111 'variables': { |
| 112 'files': [ | 112 'files': [ |
| 113 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', | 113 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_nonsfi.nmf', |
| 114 ], | 114 ], |
| 115 }, | 115 }, |
| 116 }], | 116 }], |
| 117 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', { | 117 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', { |
| 118 'variables': { | 118 'variables': { |
| 119 'files': [ | 119 'files': [ |
| 120 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe', | 120 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_arm.nexe', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 138 '(OS=="mac" or OS=="linux" or OS=="win")', { | 138 '(OS=="mac" or OS=="linux" or OS=="win")', { |
| 139 'variables': { | 139 'variables': { |
| 140 'files': [ | 140 'files': [ |
| 141 '<(PRODUCT_DIR)/lib32/', | 141 '<(PRODUCT_DIR)/lib32/', |
| 142 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', | 142 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', |
| 143 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', | 143 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', |
| 144 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', | 144 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', |
| 145 ], | 145 ], |
| 146 }, | 146 }, |
| 147 }], | 147 }], |
| 148 ['disable_nacl==0 and OS=="linux" and ' |
| 149 '(target_arch=="x64" or target_arch=="ia32")', { |
| 150 'variables': { |
| 151 'files': [ |
| 152 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32_nonsfi.nexe', |
| 153 ], |
| 154 }, |
| 155 }], |
| 148 ['OS=="mac"', { | 156 ['OS=="mac"', { |
| 149 'variables': { | 157 'variables': { |
| 150 'files': [ | 158 'files': [ |
| 151 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', | 159 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', |
| 152 '<(PRODUCT_DIR)/content_shell.pak', | 160 '<(PRODUCT_DIR)/content_shell.pak', |
| 153 '<(PRODUCT_DIR)/libclearkeycdm.dylib', | 161 '<(PRODUCT_DIR)/libclearkeycdm.dylib', |
| 154 '<(PRODUCT_DIR)/osmesa.so', | 162 '<(PRODUCT_DIR)/osmesa.so', |
| 155 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', | 163 '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', |
| 156 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', | 164 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', |
| 157 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', | 165 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 'browser/chromeos/login/test/https_forwarder.py', | 232 'browser/chromeos/login/test/https_forwarder.py', |
| 225 ], | 233 ], |
| 226 }, | 234 }, |
| 227 }], | 235 }], |
| 228 ], | 236 ], |
| 229 'includes': [ | 237 'includes': [ |
| 230 '../base/base.isolate', | 238 '../base/base.isolate', |
| 231 'chrome.isolate', | 239 'chrome.isolate', |
| 232 ], | 240 ], |
| 233 } | 241 } |
| OLD | NEW |