| OLD | NEW |
| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 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 # This test is failing on Windows: | 68 # This test is failing on Windows: |
| 69 # crbug.com/98720 | 69 # crbug.com/98720 |
| 70 # This test is failing on Valgrind because of multiple nexes. |
| 70 env.AddNodeToTestSuite(node, | 71 env.AddNodeToTestSuite(node, |
| 71 ['chrome_browser_tests'], | 72 ['chrome_browser_tests'], |
| 72 'run_ppapi_bad_browser_test', | 73 'run_ppapi_bad_browser_test', |
| 73 is_broken=env.PPAPIBrowserTesterIsBroken() or | 74 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 74 env.Bit('host_windows')) | 75 env.Bit('host_windows') or |
| 76 env.Bit('running_on_valgrind')) |
| 75 | 77 |
| 76 | 78 |
| 77 # Bad nexe tests that won't work in PNaCl (native) | 79 # Bad nexe tests that won't work in PNaCl (native) |
| 78 # For example, partly_invalid.nexe has inline assembly in its source files. | 80 # For example, partly_invalid.nexe has inline assembly in its source files. |
| 79 nacltest_js = env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/' + | 81 nacltest_js = env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/' + |
| 80 'nacltest.js') | 82 'nacltest.js') |
| 81 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}') | 83 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}') |
| 82 nmf = '${TEST_DIR}/partly_invalid.nmf' | 84 nmf = '${TEST_DIR}/partly_invalid.nmf' |
| 83 if not env.Bit('nacl_glibc'): | 85 if not env.Bit('nacl_glibc'): |
| 84 ppapi_bad_native_files = [ | 86 ppapi_bad_native_files = [ |
| (...skipping 29 matching lines...) Expand all Loading... |
| 114 'golden': '${TEST_DIR}/ppapi_bad_native_glibc.stderr'} | 116 'golden': '${TEST_DIR}/ppapi_bad_native_glibc.stderr'} |
| 115 ) | 117 ) |
| 116 | 118 |
| 117 env.AddNodeToTestSuite(node, | 119 env.AddNodeToTestSuite(node, |
| 118 ['chrome_browser_tests'], | 120 ['chrome_browser_tests'], |
| 119 'run_ppapi_bad_native_test', | 121 'run_ppapi_bad_native_test', |
| 120 is_broken=env.PPAPIBrowserTesterIsBroken() or | 122 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 121 env.Bit('bitcode')) | 123 env.Bit('bitcode')) |
| 122 | 124 |
| 123 | 125 |
| OLD | NEW |