Skip to content

Commit

Permalink
updated build
Browse files Browse the repository at this point in the history
  • Loading branch information
kripken committed Oct 29, 2012
1 parent ed44501 commit 878e9c0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion builds/ammo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
bundle = open(sys.argv[1], 'a')
bundle.write(open('bindings.js', 'r').read())
bundle.write('''
this['Ammo'] = Module; // With or without a closure, the proper usage is Ammo.*
this['Ammo'] = Module; /* With or without a closure, the proper usage is Ammo.* */
''')
bundle.close()

2 changes: 1 addition & 1 deletion test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

def run(filename):
if JS_ENGINE == SPIDERMONKEY_ENGINE:
return Popen(JS_ENGINE + ['-e', 'gcparam("maxBytes", 1024*1024*1024); load("' + build + '"); load("' + os.path.join('tests', 'testutils.js') + '")', filename], stdout=PIPE).communicate()[0]
return Popen(JS_ENGINE + ['-e', 'gcparam("maxBytes", 1024*1024*1024); var Module = { TOTAL_MEMORY: 20*1024*1024 }; load("' + build + '"); load("' + os.path.join('tests', 'testutils.js') + '")', filename], stdout=PIPE).communicate()[0]
else:
return Popen(JS_ENGINE + [build, os.path.join('tests', 'testutils.js'), filename], stdout=PIPE).communicate()[0]

Expand Down
2 changes: 1 addition & 1 deletion tests/stress.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function benchmark() {

if (TEST_MEMORY) malloc(5*1024*1024); // stress memory usage

for (var i = 0; i < 450; i++) {
for (var i = 0; i < 1000; i++) {
if (i === 250 && TEST_MEMORY) memoryStart = readMemoryCeiling();

dynamicsWorld.stepSimulation(1/60, 10);
Expand Down

0 comments on commit 878e9c0

Please sign in to comment.