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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/bad/nacl.scons

Issue 8056008: Disable ppapi_bad test for glibc on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix parens Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # 5 #
6 # Tests fatal errors that occur during loading. 6 # Tests fatal errors that occur during loading.
7 # (See ppapi_browser/crash for fatal errors that occur after loading). 7 # (See ppapi_browser/crash for fatal errors that occur after loading).
8 # TODO(polina): rename the directory and browser test to bad_load 8 # TODO(polina): rename the directory and browser test to bad_load
9 # 9 #
10 # Manual testing with localhost:5103/scons-out/.../staging/ppapi_bad.html: 10 # Manual testing with localhost:5103/scons-out/.../staging/ppapi_bad.html:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 node = env.PPAPIBrowserTester( 61 node = env.PPAPIBrowserTester(
62 'ppapi_bad_browser_test.out', 62 'ppapi_bad_browser_test.out',
63 url='ppapi_bad.html', 63 url='ppapi_bad.html',
64 nmfs=nmfs, 64 nmfs=nmfs,
65 files=[env.File(f) for f in ppapi_bad_files], 65 files=[env.File(f) for f in ppapi_bad_files],
66 args=['--allow_404']) 66 args=['--allow_404'])
67 67
68 env.AddNodeToTestSuite(node, 68 env.AddNodeToTestSuite(node,
69 ['chrome_browser_tests'], 69 ['chrome_browser_tests'],
70 'run_ppapi_bad_browser_test', 70 'run_ppapi_bad_browser_test',
71 is_broken=env.PPAPIBrowserTesterIsBroken()) 71 is_broken=env.PPAPIBrowserTesterIsBroken() or
72 (env.Bit('nacl_glibc') and env.Bit('windows')))
Nick Bray 2011/09/27 17:05:42 Please stick a comment in the code linking to the
72 73
73 74
74 # Bad nexe tests that won't work in PNaCl (native) 75 # Bad nexe tests that won't work in PNaCl (native)
75 # For example, partly_invalid.nexe has inline assembly in its source files. 76 # For example, partly_invalid.nexe has inline assembly in its source files.
76 ppapi_bad_native_files = [ 77 ppapi_bad_native_files = [
77 env.File('ppapi_bad_native.html'), 78 env.File('ppapi_bad_native.html'),
78 env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' + 79 env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
79 'ppapi_progress_events.js'), 80 'ppapi_progress_events.js'),
80 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js') 81 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
81 ] 82 ]
82 replicated_files = env.Replicate('${STAGING_DIR}', ppapi_bad_native_files) 83 replicated_files = env.Replicate('${STAGING_DIR}', ppapi_bad_native_files)
83 env.Alias('all_programs', replicated_files) 84 env.Alias('all_programs', replicated_files)
84 85
85 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}') 86 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}')
86 ppapi_bad_native_files.append(partly_invalid) 87 ppapi_bad_native_files.append(partly_invalid)
87 88
88 node = env.PPAPIBrowserTester( 89 node = env.PPAPIBrowserTester(
89 'ppapi_bad_native_test.out', 90 'ppapi_bad_native_test.out',
90 url='ppapi_bad_native.html', 91 url='ppapi_bad_native.html',
91 nmfs=['${TEST_DIR}/partly_invalid.nmf'], 92 nmfs=['${TEST_DIR}/partly_invalid.nmf'],
92 files=ppapi_bad_native_files, 93 files=ppapi_bad_native_files,
93 ) 94 )
94 95
95 env.AddNodeToTestSuite(node, 96 env.AddNodeToTestSuite(node,
96 ['chrome_browser_tests'], 97 ['chrome_browser_tests'],
97 'run_ppapi_bad_native_test', 98 'run_ppapi_bad_native_test',
98 is_broken=env.PPAPIBrowserTesterIsBroken() or 99 is_broken=env.PPAPIBrowserTesterIsBroken() or
99 env.Bit('nacl_glibc') or 100 env.Bit('nacl_glibc') or
100 env.Bit('bitcode')) 101 env.Bit('bitcode'))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698