diff options
| -rw-r--r-- | tests/runner.py | 8 | ||||
| -rw-r--r-- | tools/shared.py | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/tests/runner.py b/tests/runner.py index c102646f..c8eaa9c7 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -1964,8 +1964,8 @@ if 'benchmark' not in str(sys.argv): main_name = os.path.join(self.get_dir(), 'main.cpp') open(main_name, 'w').write(main) - Building.emmaken(supp_name) - Building.emmaken(main_name) + Building.emcc(supp_name) + Building.emcc(main_name) all_name = os.path.join(self.get_dir(), 'all.bc') Building.link([supp_name + '.o', main_name + '.o'], all_name) @@ -4484,8 +4484,8 @@ Child2:9 main_name = os.path.join(self.get_dir(), 'main.cpp') open(main_name, 'w').write(main) - Building.emmaken(module_name, ['-g']) - Building.emmaken(main_name, ['-g']) + Building.emcc(module_name, ['-g']) + Building.emcc(main_name, ['-g']) all_name = os.path.join(self.get_dir(), 'all.bc') Building.link([module_name + '.o', main_name + '.o'], all_name) diff --git a/tools/shared.py b/tools/shared.py index faf26816..ea80c08b 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -362,13 +362,10 @@ class Building: ret.defs.append(symbol) return ret - @staticmethod # TODO: make this use emcc instead of emmaken - def emmaken(filename, args=[], stdout=None, stderr=None, env=None): - try: - os.remove(filename + '.o') - except: - pass - Popen([EMMAKEN, filename] + args + ['-o', filename + '.o'], stdout=stdout, stderr=stderr, env=env).communicate()[0] + @staticmethod + def emcc(filename, args=[], stdout=None, stderr=None, env=None): + try_delete(filename + '.o') + Popen([EMCC, filename] + args + ['-o', filename + '.o'], stdout=stdout, stderr=stderr, env=env).communicate()[0] assert os.path.exists(filename + '.o'), 'Could not create bc file' @staticmethod |