Merge branch 'import_shared_properly' into test_poppler

ehsan · ehsan · commit fddfd311e7eb · 2012-01-31T14:13:18.000-05:00
diff --git a/tests/runner.py b/tests/runner.py
@@ -22,6 +22,7 @@
 def path_from_root(*pathelems):
   return os.path.join(__rootpath__, *pathelems)
 sys.path += [path_from_root('')]
+import tools.shared
 from tools.shared import *
 
 # Sanity check for config
@@ -40,7 +41,9 @@ class RunnerCore(unittest.TestCase):
                            # Change this to None to get stderr reporting, for debugging purposes
 
   def setUp(self):
+    global Settings
     Settings.reset()
+    Settings = tools.shared.Settings
     self.banned_js_engines = []
     if not self.save_dir:
       dirname = tempfile.mkdtemp(prefix='emscripten_test_' + self.__class__.__name__ + '_', dir=TEMP_DIR)
