OLD | NEW |
1 <!-- | 1 <!-- |
2 Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 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 | 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 | 6 |
7 <script type="text/javascript" src="nacltest.js"></script> | 7 <script type="text/javascript" src="nacltest.js"></script> |
8 | 8 |
9 <div id="scratch_space"></div> | 9 <div id="scratch_space"></div> |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 | 34 |
35 div.addEventListener('load', status.wrap(function(event) { | 35 div.addEventListener('load', status.wrap(function(event) { |
36 status.fail('We expected this process to crash during startup'); | 36 status.fail('We expected this process to crash during startup'); |
37 }), true); | 37 }), true); |
38 | 38 |
39 div.addEventListener('error', status.wrap(function(event) { | 39 div.addEventListener('error', status.wrap(function(event) { |
40 var error = embed.lastError; | 40 var error = embed.lastError; |
41 status.log('Received error: ' + error); | 41 status.log('Received error: ' + error); |
42 // This error occurs only because NACL_CRASH_TEST is set. We would | 42 // This error occurs only because NACL_CRASH_TEST is set. We would |
43 // not normally expect to get this error in the browser. | 43 // not normally expect to get this error in the browser. |
44 // For PNaCl, the crash will occur while starting the compiler process. | 44 var expected_error_prefix = 'NaCl module load failed: ServiceRuntime: '; |
45 var test_args = getTestArguments({ 'is_pnacl': 'false' }); | 45 var suffix1 = 'command channel creation failed'; |
46 if (test_args['is_pnacl'] != 'false') { | 46 var suffix2 = 'failed to start'; |
47 var expected_error = ('NaCl module load failed: PnaclCoordinator: ' + | 47 status.assert(error == expected_error_prefix + suffix1 || |
48 'Compile process could not be created'); | 48 error == expected_error_prefix + suffix2); |
49 status.assert(begins_with(embed.lastError, expected_error)); | |
50 } else { | |
51 var expected_error_prefix = 'NaCl module load failed: ServiceRuntime: '; | |
52 var suffix1 = 'command channel creation failed'; | |
53 var suffix2 = 'failed to start'; | |
54 status.assert(error == expected_error_prefix + suffix1 || | |
55 error == expected_error_prefix + suffix2); | |
56 } | |
57 status.pass(); | 49 status.pass(); |
58 }), true); | 50 }), true); |
59 | 51 |
60 document.getElementById('scratch_space').appendChild(div); | 52 document.getElementById('scratch_space').appendChild(div); |
61 }); | 53 }); |
62 | 54 |
63 tester.run(); | 55 tester.run(); |
64 | 56 |
65 </script> | 57 </script> |
OLD | NEW |