aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-23 18:14:40 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-23 18:28:28 -0700
commitd69f425ab33c3cce1979024421dcde6a02218914 (patch)
treea06a22eb17f7c500e6b7117c2e6abfaf91609ec7 /tests
parentd9b385883799f8ec5b8d3646276536d580c436ff (diff)
simplify chunk size determination in emscripten.py
Diffstat (limited to 'tests')
-rw-r--r--tests/test_other.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_other.py b/tests/test_other.py
index 56c13650..9f331439 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -1665,10 +1665,10 @@ f.close()
if multiprocessing.cpu_count() < 2: return self.skip('need multiple cores')
try:
os.environ['EMCC_DEBUG'] = '1'
- os.environ['EMCC_CORES'] = '2'
+ os.environ['EMCC_CORES'] = '2' # standardize over machines
for asm, linkable, chunks, js_chunks in [
- (0, 0, 3, 2), (0, 1, 3, 4),
- (1, 0, 3, 2), (1, 1, 3, 4)
+ (0, 0, 2, 2), (0, 1, 2, 4),
+ (1, 0, 2, 2), (1, 1, 2, 4)
]:
print asm, linkable, chunks, js_chunks
output, err = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_libcxx.cpp'), '-O1', '-s', 'LINKABLE=%d' % linkable, '-s', 'ASM_JS=%d' % asm] + (['-O2'] if asm else []), stdout=PIPE, stderr=PIPE).communicate()