1 files changed, 6 insertions, 13 deletions
diff --git a/tests/runner.py b/tests/runner.py
index cdf9e08e..f0763ba8 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7667,21 +7667,14 @@ void*:16
 
     def test_lua(self):
       if self.emcc_args is None: return self.skip('requires emcc')
-      if 'le32-unknown-nacl' in COMPILER_OPTS: return self.skip('cannot use our existing bitcode file which is of a different target')
-
       if Settings.QUANTUM_SIZE == 1: return self.skip('TODO: make this work')
 
-      # Overflows in luaS_newlstr hash loop
-      if self.emcc_args is None: Settings.SAFE_HEAP = 0 # Has various warnings, with copied HEAP_HISTORY values (fixed if we copy 'null' as the type)
-      Settings.CORRECT_OVERFLOWS = 1
-      Settings.CHECK_OVERFLOWS = 0
-      Settings.CORRECT_SIGNS = 1 # Not sure why, but needed
-
-      self.do_ll_run(path_from_root('tests', 'lua', 'lua.ll'),
-                      'hello lua world!\n17\n1\n2\n3\n4\n7',
-                      args=['-e', '''print("hello lua world!");print(17);for x = 1,4 do print(x) end;print(10-3)'''],
-                      output_nicerizer=lambda string, err: (string + err).replace('\n\n', '\n').replace('\n\n', '\n'),
-                      extra_emscripten_args=['-H', 'libc/fcntl.h,libc/sys/unistd.h,poll.h,libc/math.h,libc/langinfo.h,libc/time.h'])
+      self.do_run('',
+                  'hello lua world!\n17\n1\n2\n3\n4\n7',
+                  args=['-e', '''print("hello lua world!");print(17);for x = 1,4 do print(x) end;print(10-3)'''],
+                  libraries=self.get_library('lua', [os.path.join('src', 'lua'), os.path.join('src', 'liblua.a')], make=['make', 'generic'], configure=None),
+                  includes=[path_from_root('tests', 'lua')],
+                  output_nicerizer=lambda string, err: (string + err).replace('\n\n', '\n').replace('\n\n', '\n'))
 
     def get_freetype(self):
       Settings.DEAD_FUNCTIONS += ['_inflateEnd', '_inflate', '_inflateReset', '_inflateInit2_']