Chromium Code Reviews Chromium Code Reviews
Issue 9264026:
Add support for generating nmfs for pnacl pexes with glibc (vs pnacl nexes). (Closed)
Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client| Index: tests/pnacl_client_translator/pnacl_test_example.html |
| diff --git a/tests/pnacl_client_translator/pnacl_test_example.html b/tests/pnacl_client_translator/pnacl_test_example.html |
| index 21f0a157aeb350bd3a69bf369a55c46ba0b2124f..127c81b15665534fc58fad91891a2fed31c6ca0f 100644 |
| --- a/tests/pnacl_client_translator/pnacl_test_example.html |
| +++ b/tests/pnacl_client_translator/pnacl_test_example.html |
| @@ -1,7 +1,7 @@ |
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| <!-- |
| - Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| + Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| Use of this source code is governed by a BSD-style license that can be |
| found in the LICENSE file. |
| --> |
| @@ -34,6 +34,7 @@ |
| nexe_div.addEventListener('progress', updateProgress, true); |
| nexe_div.addEventListener('load', updateProgress, true); |
| nexe_div.addEventListener('loadend', updateProgress, true); |
| + nexe_div.addEventListener('loadend', updateProgress, true); |
| } |
| //]]> |
| </script> |
| @@ -41,19 +42,32 @@ |
| <body onload="pageDidLoad()"> |
| <h1>PNACL Test Example</h1> |
| + |
| + <!-- Tests an nmf with both arch-specific and 'portable' field set, |
| + but using an ENV flag that forces it to choose portable. --> |
| <embed type="application/x-nacl" id="test_nexe" |
| name="nacl_module" |
| src="pnacl_test_example.nmf" |
| - width="0" height="0" /> |
| + width="20" height="20" |
| + style="background-color:gray" /> |
| + |
| + <!-- Tests an with just the 'portable' field set. --> |
| + <embed type="application/x-nacl" id="test_nexe2" |
|
jvoung - send to chromium...
2012/01/20 18:47:11
Well, now we are launching 6 nexes simultaneously
|
| + name="nacl_module" |
| + src="pnacl_test_example2.nmf" |
| + width="20" height="20" |
| + style="background-color:gray" /> |
| - <script type="text/javascript"> |
| - //<![CDATA[ |
| - var tester = new Tester(); |
| - setupTests(tester, $('test_nexe')); |
| - tester.waitFor($('test_nexe')); |
| - tester.run(); |
| - //]]> |
| - </script> |
| + <script type="text/javascript"> |
| + //<![CDATA[ |
| + var tester = new Tester(); |
| + setupTests(tester, $('test_nexe')); |
| + setupTests(tester, $('test_nexe2')); |
| + tester.waitFor($('test_nexe')); |
| + tester.waitFor($('test_nexe2')); |
| + tester.run(); |
| + //]]> |
| + </script> |
| <p> This should tick when the UI thread is not blocked:</p> |
| <div id="counter_area"> 0.0 </div> |
