cleanup

emlink.py

@@ -55,11 +55,12 @@ class AsmModule():
   def relocate_into(self, main):
     # heap initializer TODO
 
+    # global initializers TODO
+
     # imports
     main_imports = set(main.imports)
     new_imports = [imp for imp in self.imports if imp not in main_imports]
-    print 'new imports', new_imports
-    #main.imports_js += '\n'.join(new_imports)
+    main.imports_js += '\n'.join(new_imports)
 
     # Find function name replacements TODO: do not rename duplicate names with duplicate contents, just merge them
     main_funcs = set(main.funcs)
@@ -69,7 +70,6 @@ class AsmModule():
       while rep in main_funcs:
         rep += '_'
         replacements[func] = rep
-    #print replacements
 
     temp = shared.Building.js_optimizer(self.filename, ['asm', 'relocate'], extra_info={ 'replacements': replacements })
     relocated_funcs = AsmModule(temp)

tests/runner.py

@@ -10623,9 +10623,9 @@ f.close()
       Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'side.cpp'), '-o', 'side.js', '-s', 'SIDE_MODULE=1', '-O2']).communicate()
       # TODO: test with and without DISABLE_GL_EMULATION, check that file sizes change
       Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp'), '-o', 'main.js', '-s', 'MAIN_MODULE=1', '-O2', '-s', 'DISABLE_GL_EMULATION=1']).communicate()
-      Popen([PYTHON, EMLINK, 'main.js', 'side.js', 'together.js'])
-      assert os.path.exists(self.in_dir('together.js'))
-      self.assertContained('hello from side', run_js(self.in_dir('together.js')))
+      Popen([PYTHON, EMLINK, 'main.js', 'side.js', 'together.js']).communicate()
+      assert os.path.exists('together.js')
+      self.assertContained('hello from side', run_js('together.js'))
 
     def test_symlink(self):
       if os.name == 'nt':