From 703e9cfb827f51c8bd900ebcb3ed4994f4a62672 Mon Sep 17 00:00:00 2001 From: Peter Cawley Date: Fri, 6 May 2016 22:26:46 +0100 Subject: [PATCH] Skip some tests under LuaJIT 2.0 --- test/lib/contents.lua | 6 +++++- test/lib/ffi/index | 2 +- test/opt/fold/kfold.lua | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/lib/contents.lua b/test/lib/contents.lua index b2a1a7adbc..0328c98917 100644 --- a/test/lib/contents.lua +++ b/test/lib/contents.lua @@ -147,5 +147,9 @@ do --- bit +bit end do --- ffi +ffi - check(require"ffi", "C:abi:alignof:arch:cast:cdef:copy:errno:fill:gc:istype:load:metatype:new:offsetof:os:sizeof:string:typeinfo:typeof") + check(require"ffi", "C:abi:alignof:arch:cast:cdef:copy:errno:fill:gc:istype:load:metatype:new:offsetof:os:sizeof:string:typeof", "typeinfo") +end + +do --- ffi 2.1 +fii +luajit>=2.1 + assert(require"ffi".typeinfo) end diff --git a/test/lib/ffi/index b/test/lib/ffi/index index c4091fb727..bda633000d 100644 --- a/test/lib/ffi/index +++ b/test/lib/ffi/index @@ -1,4 +1,4 @@ -bit64.lua +bit +bit64.lua +luajit>=2.1 copy_fill.lua err.lua istype.lua diff --git a/test/opt/fold/kfold.lua b/test/opt/fold/kfold.lua index 4100bf9150..9cd39190de 100644 --- a/test/opt/fold/kfold.lua +++ b/test/opt/fold/kfold.lua @@ -76,6 +76,6 @@ do --- sqrt exp log trig for i=1,100 do local a=23; y=math.tan(a) end assert(y==math.tan(23)) end -do --- exp +do --- exp -luajit==2.0 assert((10^-2 - 0.01) == 0) end