aboutsummaryrefslogtreecommitdiff
path: root/tests/runner.py
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2012-11-14 08:46:37 +0200
committerJukka Jylänki <jujjyl@gmail.com>2012-11-14 13:00:36 +0200
commit5ec613c59de33b4949d17397aff81d54e49c21c6 (patch)
treeb4cbe46c57b018770c8493299db0efbacbde4144 /tests/runner.py
parente20dbc1074a36da62080e936f61f0c2719638f2e (diff)
Refactor Windows replacement for Popen to allow passing stdin to Popen process, and poll() and kill(). Fixes tests other.test_fix_closure and other.test_warn_undefined on Windows.
Diffstat (limited to 'tests/runner.py')
-rwxr-xr-xtests/runner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index b2249dac..0baf79dc 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7571,7 +7571,7 @@ f.close()
if 'error' in ret[1].lower():
print >> sys.stderr, 'Failed command: ' + ' '.join(cmd)
print >> sys.stderr, 'Result:\n' + ret[1]
- raise Exception('cmake call failed!') # cmake spams this silly message to stderr, so hide it: "Platform/Emscripten to use this system, please send your config file to cmake@www.cmake.org so it can be added to cmake"
+ raise Exception('cmake call failed!')
assert os.path.exists(tempdirname + '/Makefile'), 'CMake call did not produce a Makefile!'
# Build
@@ -8082,7 +8082,7 @@ f.close()
}
''')
output = Popen(['python', EMCC, os.path.join(self.get_dir(), 'main.cpp'), '-s', 'WARN_ON_UNDEFINED_SYMBOLS=1'], stderr=PIPE).communicate()
- self.assertContained('Unresolved symbol: _something\n', output[1])
+ self.assertContained('Unresolved symbol: _something', output[1])
output = Popen(['python', EMCC, os.path.join(self.get_dir(), 'main.cpp')], stderr=PIPE).communicate()
self.assertNotContained('Unresolved symbol: _something\n', output[1])