aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-04-25 15:47:50 -0700
committerAlon Zakai <alonzakai@gmail.com>2014-04-25 15:47:50 -0700
commit5940f5fc55f36e55466716514945cb6ac54c4634 (patch)
tree9460c320606b3582b24d24876cebe6bd8f685d77 /tests
parentffa17762a625018c557a39056ac8eb0b54251694 (diff)
parent9a530d0e76ea951f761d93ce3aa739b5605acb25 (diff)
Merge pull request #2287 from chadaustin/embind-fastcomp-asm.js
Enable embind in fastcomp/asm.js
Diffstat (limited to 'tests')
-rw-r--r--tests/test_core.py4
-rw-r--r--tests/test_other.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_core.py b/tests/test_core.py
index b5024309..d25a61be 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -5635,7 +5635,6 @@ def process(filename):
def test_embind(self):
if self.emcc_args is None: return self.skip('requires emcc')
- if os.environ.get('EMCC_FAST_COMPILER') != '0': return self.skip('todo in fastcomp')
Building.COMPILER_TEST_OPTS += ['--bind']
src = r'''
@@ -5658,7 +5657,8 @@ def process(filename):
def test_embind_2(self):
if self.emcc_args is None: return self.skip('requires emcc')
- if os.environ.get('EMCC_FAST_COMPILER') != '0': return self.skip('todo in fastcomp')
+ if self.run_name == 'asm2f': return self.skip('embind/asm.js not compatible with PRECISE_F32 because it changes signature strings')
+ if self.run_name == 'slow2asm': return self.skip('embind/asm.js requires fastcomp')
Building.COMPILER_TEST_OPTS += ['--bind', '--post-js', 'post.js']
open('post.js', 'w').write('''
Module.print('lerp ' + Module.lerp(1, 2, 0.66) + '.');
diff --git a/tests/test_other.py b/tests/test_other.py
index e4d91ba6..4b5ed666 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -1880,7 +1880,6 @@ This pointer might make sense in another type signature: i: 0
def test_embind(self):
def nonfc():
- if os.environ.get('EMCC_FAST_COMPILER') != '0': return self.skip('todo in fastcomp')
for args, fail in [
([], True), # without --bind, we fail
(['--bind'], False),