Merge pull request #214 from luvit/fixes/bump_to_2_1

bump to luajit 2.1
luvit · Feb 6, 2016 · d3a99c2 · d3a99c2
2 parents fa353fd + a59cf40
commit d3a99c2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/deps/luajit b/deps/luajit
diff --git a/deps/luajit.cmake b/deps/luajit.cmake
@@ -224,6 +224,9 @@ SET(SRC_LJCORE
   ${LUAJIT_DIR}/src/lj_gc.c
   ${LUAJIT_DIR}/src/lj_err.c
   ${LUAJIT_DIR}/src/lj_char.c
+  ${LUAJIT_DIR}/src/lj_buf.c
+  ${LUAJIT_DIR}/src/lj_profile.c
+  ${LUAJIT_DIR}/src/lj_strfmt.c
   ${LUAJIT_DIR}/src/lj_bc.c
   ${LUAJIT_DIR}/src/lj_obj.c
   ${LUAJIT_DIR}/src/lj_str.c

diff --git a/tests/test-conversions.lua b/tests/test-conversions.lua
@@ -0,0 +1,6 @@
+return require('lib/tap')(function (test)
+  test("basic 64bit conversions", function (print, p, expect, uv)
+    assert(string.format("%x", 29913653248) == "6f6fe2000")
+    assert(string.format("%x", 32207650816) == "77fb9c000")
+  end)
+end)