diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-01-27 18:04:06 -0500 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-01-27 18:04:06 -0500 |
| commit | 2c14079df5923a7c02b0c5a80cce54569ba754c5 (patch) | |
| tree | a61d6b14178b64c4133ba15866cf9be2bd03a576 | |
| parent | 0ed56c82a3d1d6c86eb648a7062ee6a4fb92b4f9 (diff) | |
Make the test automated!
| -rw-r--r-- | tests/hello_world_gles_shell.html | 55 | ||||
| -rwxr-xr-x | tests/runner.py | 32 |
2 files changed, 82 insertions, 5 deletions
diff --git a/tests/hello_world_gles_shell.html b/tests/hello_world_gles_shell.html new file mode 100644 index 00000000..ad2c5a87 --- /dev/null +++ b/tests/hello_world_gles_shell.html @@ -0,0 +1,55 @@ +<html> + <head> + <title>Emscripten-Generated Code</title> + <body> + <center> + <canvas id='canvas' width='256' height='256'></canvas> + </center> + <hr> + <div id='output'></div> + <hr> + <script type='text/javascript'> + /** + * TODO: Encapsulate this part in a reusable token such as + * EMSCRIPTEN_ENVIRONMENT so that we can share code + * between the default shell and custom ones. + */ + // connect to canvas + var Module = { + print: (function() { + var element = document.getElementById('output'); + return function(text) { + element.innerHTML += text.replace('\n', '<br>', 'g') + '<br>'; + }; + })(), + canvas: document.getElementById('canvas') + }; + + // The compiled code + {{{ SCRIPT_CODE }}} + + // Test code + function simulateKeyEvent(keyCode) { + var event = document.createEvent("KeyboardEvent"); + event.initKeyEvent("keydown", true, true, window, + 0, 0, 0, 0, keyCode, 0); + document.body.dispatchEvent(event); + } + function reportResult(result) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', 'http://localhost:8888/report_gl_result?' + result, true); + xhr.send(); + } + function doTest() { + var firstImage = Module.canvas.toDataURL(); + simulateKeyEvent(0x25 /* DOM_VK_LEFT */); + setTimeout(function() { + var secondImage = Module.canvas.toDataURL(); + reportResult(firstImage != secondImage); + }, 0); + } + addEventListener("load", doTest, false); + </script> + </body> +</html> + diff --git a/tests/runner.py b/tests/runner.py index 997facd5..6e4054cb 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -14,7 +14,7 @@ will use 4 processes. To install nose do something like ''' from subprocess import Popen, PIPE, STDOUT -import os, unittest, tempfile, shutil, time, inspect, sys, math, glob, tempfile, re, difflib, webbrowser, hashlib +import os, unittest, tempfile, shutil, time, inspect, sys, math, glob, tempfile, re, difflib, webbrowser, hashlib, BaseHTTPServer, threading # Setup @@ -5580,13 +5580,32 @@ f.close() # TODO: test normal project linking, static and dynamic: get_library should not need to be told what to link! # TODO: deprecate llvm optimizations, dlmalloc, etc. in emscripten.py. + # For browser tests which report their success + def run_test_server(expectedResult): + class TestServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): + def do_GET(s): + assert s.path == expectedResult, 'Expected %s, got %s' % (expectedResult, s.path) + httpd.shutdown() + def handle_timeout(): + assert False, 'Timed out while waiting for the browser test to finish' + httpd.shutdown() + httpd = BaseHTTPServer.HTTPServer(('localhost', 8888), TestServerHandler) + httpd.timeout = 5; + server_thread = threading.Thread(target=httpd.serve_forever) + server_thread.daemon = True + server_thread.start() + server_thread.join(5.5) + # Finally, do some web browser tests - def run_browser(html_file, message): + def run_browser(html_file, message, expectedResult = None): webbrowser.open_new(os.path.abspath(html_file)) print 'A web browser window should have opened a page containing the results of a part of this test.' print 'You need to manually look at the page to see that it works ok: ' + message print '(sleeping for a bit to keep the directory alive for the web browser..)' - time.sleep(5) + if expectedResult is not None: + run_test_server(expectedResult) + else: + time.sleep(5) print '(moving on..)' # test HTML generation. @@ -5620,10 +5639,13 @@ f.close() # test the OpenGL ES implementation clear() - output = Popen([EMCC, path_from_root('tests', 'hello_world_gles.c'), '-o', 'something.html', '-DHAVE_BUILTIN_SINCOS'], stdout=PIPE, stderr=PIPE).communicate() + output = Popen([EMCC, path_from_root('tests', 'hello_world_gles.c'), '-o', 'something.html', + '-DHAVE_BUILTIN_SINCOS', + '--shell-file', path_from_root('tests', 'hello_world_gles_shell.html')], + stdout=PIPE, stderr=PIPE).communicate() assert len(output[0]) == 0, output[0] assert os.path.exists('something.html'), output - run_browser('something.html', 'You should see animating gears.') + run_browser('something.html', 'You should see animating gears.', '/report_gl_result?true') def test_eliminator(self): input = open(path_from_root('tools', 'eliminator', 'eliminator-test.js')).read() |