Merge remote-tracking branch 'origin/1.10' into 2.0

tarantool · Mar 11, 2018 · 35be874 · 35be874
2 parents b080a7f + 733b74e
commit 35be874
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/test/luajit-tap/gh.test.lua b/test/luajit-tap/gh.test.lua
@@ -0,0 +1,17 @@
+#!/usr/bin/env tarantool
+
+-- Miscellaneous test for LuaJIT bugs
+tap = require('tap')
+
+test = tap.test("gh")
+test:plan(2)
+--
+-- gh-3196: incorrect string length if Lua hash returns 0
+--
+h = "\x1F\x93\xE2\x1C\xCA\xDE\x28\x08\x26\x01\xED\x0A\x2F\xE4\x21\x02\x97\x77\xD9\x3E"
+test:is(h:len(), 20)
+
+h = "\x0F\x93\xE2\x1C\xCA\xDE\x28\x08\x26\x01\xED\x0A\x2F\xE4\x21\x02\x97\x77\xD9\x3E"
+test:is(h:len(), 20)
+
+test:check()
diff --git a/test/luajit-tap/suite.ini b/test/luajit-tap/suite.ini
@@ -0,0 +1,4 @@
+[default]
+core = app
+description = Luajit tests
+is_parallel = False
diff --git a/third_party/luajit b/third_party/luajit