diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-22 13:13:51 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-22 13:13:51 -0700 |
| commit | dc2c294d3a35479574536c7895a183e68505a95a (patch) | |
| tree | 7a1b32844a37e437165382285d96c5a8569078f5 | |
| parent | 46398a40e7fde539f6645d12772ff7493b0ba2b1 (diff) | |
move save_dir and save_js settings
| -rw-r--r-- | tests/runner.py | 11 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/runner.py b/tests/runner.py index 6699e4e5..6520b099 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -35,8 +35,11 @@ GlobalCache = {} # Core test runner class, shared between normal tests and benchmarks class RunnerCore(unittest.TestCase): + save_dir = 0 + save_JS = 0 + def setUp(self): - if not Settings.save_dir: + if not self.save_dir: dirname = tempfile.mkdtemp(prefix="ems_" + self.__class__.__name__ + "_", dir=TEMP_DIR) else: dirname = os.path.join(TEMP_DIR, 'tmp') @@ -45,13 +48,13 @@ class RunnerCore(unittest.TestCase): self.working_dir = dirname def tearDown(self): - if Settings.save_JS: + if self.save_JS: for name in os.listdir(self.get_dir()): if name.endswith(('.o.js', '.cc.js')): suff = '.'.join(name.split('.')[-2:]) shutil.copy(os.path.join(self.get_dir(), name), os.path.join(TEMP_DIR, self.id().replace('__main__.', '').replace('.test_', '.')+'.'+suff)) - if not Settings.save_dir: + if not self.save_dir: shutil.rmtree(self.get_dir()) def skip(self, why): @@ -1426,7 +1429,7 @@ if 'benchmark' not in str(sys.argv): self.do_run(src, '*2,2,5,8,8***8,8,5,8,8***7,2,6,990,7,2*', [], lambda x: x.replace('\n', '*')) def test_emscripten_api(self): - if Settings.OPTIMIZE or Settings.RELOOP or LLVM_OPTS: return self.skip('FIXME') + #if Settings.OPTIMIZE or Settings.RELOOP or LLVM_OPTS: return self.skip('FIXME') src = ''' #include <stdio.h> diff --git a/tools/shared.py b/tools/shared.py index c0cc6f21..e98436e4 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -211,6 +211,4 @@ def read_auto_optimize_data(filename): class Dummy: pass Settings = Dummy() # A global singleton. Not pretty, but nicer than passing |, settings| everywhere -Settings.save_dir = 0 -Settings.save_JS = 0 |