aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJez Ng <me@jezng.com>2013-06-20 16:36:42 -0700
committerJez Ng <me@jezng.com>2013-06-22 01:23:21 -0700
commit99fa57e08e92821e1f6f4dd230e80970ad366250 (patch)
tree1ea12384748884163ea0e4552fbada8508ac30b2
parent5459b3543fdc8eb01806e6fb03b05d19bd2815e9 (diff)
Make test_debug actually fail when things go wrong.
-rwxr-xr-xemcc2
-rwxr-xr-xtests/runner.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/emcc b/emcc
index 48ecd604..650ba9e9 100755
--- a/emcc
+++ b/emcc
@@ -1490,7 +1490,7 @@ try:
final += '.tr.js'
posix = True if not shared.WINDOWS else False
logging.debug('applying transform: %s' % js_transform)
- execute(shlex.split(js_transform, posix=posix) + [os.path.abspath(final)])
+ subprocess.check_call(shlex.split(js_transform, posix=posix) + [os.path.abspath(final)])
if DEBUG: save_intermediate('transformed')
js_transform_tempfiles = [final]
diff --git a/tests/runner.py b/tests/runner.py
index 479f4824..10478b6a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -9582,7 +9582,7 @@ def process(filename):
self.do_run(src, '*nothingatall*', post_build=post)
except Exception, e:
# This test *should* fail
- assert 'Assertion failed' in str(e), str(e)
+ assert 'Assertion failed: x < 15' in str(e), str(e)
def test_source_map(self):
if Settings.USE_TYPED_ARRAYS != 2: return self.skip("doesn't pass without typed arrays")