diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
| commit | 90dcac551fee69cf284ae4431db949bc69796a1c (patch) | |
| tree | a15ccaaac95e1ae60527d7edbe8ff5857ee0a77a | |
| parent | 92f9f71cba2781b72cf25a9c6e9dcb5e860a2dd9 (diff) | |
| parent | 5182542126a5ad3c40d958b0b72cfa16f4e8bd25 (diff) | |
Merge branch 'fixup-node-version-check' of github.com:bnoordhuis/emscripten into incoming
Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | tests/test_sanity.py | 6 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -105,4 +105,5 @@ a license to everyone to use it as detailed in LICENSE.) * Remi Papillie <remi.papillie@gmail.com> * Fraser Adams <fraser.adams@blueyonder.co.uk> * Michael Tirado <icetooth333@gmail.com> +* Ben Noordhuis <info@bnoordhuis.nl> diff --git a/tests/test_sanity.py b/tests/test_sanity.py index a0fff252..a405c3a3 100644 --- a/tests/test_sanity.py +++ b/tests/test_sanity.py @@ -217,7 +217,11 @@ class sanity(RunnerCore): try: os.environ['EM_IGNORE_SANITY'] = '1' - for version, succeed in [('v0.7.9', False), ('v0.8.0', True), ('v0.8.1', True), ('cheez', False)]: + for version, succeed in [('v0.7.9', False), + ('v0.8.0', True), + ('v0.8.1', True), + ('v0.10.21-pre', True), + ('cheez', False)]: f = open(path_from_root('tests', 'fake', 'nodejs'), 'w') f.write('#!/bin/sh\n') f.write('''if [ $1 = "--version" ]; then diff --git a/tools/shared.py b/tools/shared.py index 108a48a4..f6c0cc95 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -284,7 +284,7 @@ def check_node_version(): try: node = listify(NODE_JS) actual = Popen(node + ['--version'], stdout=PIPE).communicate()[0].strip() - version = tuple(map(int, actual.replace('v', '').split('.'))) + version = tuple(map(int, actual.replace('v', '').replace('-pre', '').split('.'))) if version >= EXPECTED_NODE_VERSION: return True logging.warning('node version appears too old (seeing "%s", expected "%s")' % (actual, 'v' + ('.'.join(map(str, EXPECTED_NODE_VERSION))))) |