From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 247C56EC56; Sat, 13 Mar 2021 21:41:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 247C56EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615660901; bh=pZOJIRw+4wP9PQZ5qmFJ1qDEqr9EgJPf56RtfdP6Xbo=; h=In-Reply-To:Date:References:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yTsGvYO+4xa4OtyoeJgjB9OpdGh1YvTVLxrujtW49iIYHKnJ3s7MR2d71qI96Idi1 +uXoV5A2x3M6CLMpMS7Pwu+GDKJa5G+iw4/qp0HsWmEPKL1U0GFN/sstuz8U5nxdne pVSfGt+91eFyWyWpbL7TxyqgZ6pOzfIoCScQU5fs= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 0041C6EC56 for ; Sat, 13 Mar 2021 21:41:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0041C6EC56 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1lL9Ck-0003MJ-Md; Sat, 13 Mar 2021 21:41:39 +0300 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) In-Reply-To: Date: Sat, 13 Mar 2021 21:41:37 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <17DBB8DA-FF25-464A-A187-6E1D6AFB1954@tarantool.org> References: To: Sergey Kaplun X-Mailer: Apple Mail (2.3654.60.0.2.21) X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69BC7A690B93B93DD09EFED8A8D520004C100894C459B0CD1B91416D062F5D8955EA948A6BDD4D34B9E0B1F0891EFECEF98C252A97683EF5A77 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE752E71F0C64B7C834EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371758572763D318798638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C7FF294EE7CC9FD504F38114BFD1F1EAEC71068154EC5F4A2A471835C12D1D9774AD6D5ED66289B5259CC434672EE6371117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658359CC434672EE6371117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C2249045A9A90E9EED90B089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7CA819EB9AE8EA3DE343847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FDCD13837A2BCF0203C9F3DD0FB1AF5EB4E70A05D1297E1BBCB5012B2E24CD356 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2BBE337FB72E923155C0AF1600DCBC20B6B58427014E5D5337A38AA8A07D36801 X-C1DE0DAB: 0D63561A33F958A5FDBF3D3169D37A17CCC353DBB86AD4842940B984315FC5F8D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34B9F55CA4D2956E30AC09EC9E05BE9EE350AA228FA6BC9FFAD05AC1DB6E225B38BFFAE39D131EB1F61D7E09C32AA3244CC22BFFD75E516BD40B95F3DA3603486AD9ADFF0C0BDB8D1FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj510EsIhvqdkB5ENqz1TvFQ== X-Mailru-Sender: 3B9A0136629DC912F4AABCEFC589C81E468525602CDB7ACBFD023A8F1498132BD4F9BCE6C86E83FCAD07DD1419AC565FA614486B47F28B67C5E079CCF3B0523AED31B7EB2E253A9E112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/6] test: adjust lua-Harness test suite for Tarantool X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Ostanevich via Tarantool-patches Reply-To: Sergey Ostanevich Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! LGTM. Sergos. > On 12 Mar 2021, at 08:27, Sergey Kaplun wrote: >=20 > This patch makes it possible to run lua-Harness test suite using > Tarantool. >=20 > Tarantool has its own loaded tap built in so need to change name to > another one. >=20 > 203-lexico.t and 301-basic.t is adjusted to valid working with > out-of-source build in Tarantool CI. >=20 > Also creates additional list of files provided to prove via stdin. > This is required to avoid tests hungs via Tarantool's binary. > Partially this problem is descripted in tarantool/tarantool#5040. >=20 > Part of tarantool/tarantool#5844 > Part of tarantool/tarantool#4473 > --- > Author: Mergen Imeev >=20 > .gitignore | 1 + > test/lua-Harness-tests/090-tap.t | 2 +- > test/lua-Harness-tests/091-profile.t | 2 +- > test/lua-Harness-tests/101-boolean.t | 2 +- > test/lua-Harness-tests/102-function.t | 2 +- > test/lua-Harness-tests/103-nil.t | 2 +- > test/lua-Harness-tests/104-number.t | 2 +- > test/lua-Harness-tests/105-string.t | 2 +- > test/lua-Harness-tests/106-table.t | 2 +- > test/lua-Harness-tests/107-thread.t | 2 +- > test/lua-Harness-tests/108-userdata.t | 2 +- > test/lua-Harness-tests/200-examples.t | 2 +- > test/lua-Harness-tests/201-assign.t | 2 +- > test/lua-Harness-tests/202-expr.t | 2 +- > test/lua-Harness-tests/203-lexico.t | 14 +++++++++----- > test/lua-Harness-tests/204-grammar.t | 2 +- > test/lua-Harness-tests/211-scope.t | 2 +- > test/lua-Harness-tests/212-function.t | 2 +- > test/lua-Harness-tests/213-closure.t | 2 +- > test/lua-Harness-tests/214-coroutine.t | 2 +- > test/lua-Harness-tests/221-table.t | 2 +- > test/lua-Harness-tests/222-constructor.t | 2 +- > test/lua-Harness-tests/223-iterator.t | 2 +- > test/lua-Harness-tests/231-metatable.t | 2 +- > test/lua-Harness-tests/232-object.t | 2 +- > test/lua-Harness-tests/241-standalone.t | 10 +++++----- > test/lua-Harness-tests/242-luac.t | 2 +- > test/lua-Harness-tests/301-basic.t | 7 +++++-- > test/lua-Harness-tests/303-package.t | 6 +++--- > test/lua-Harness-tests/304-string.t | 2 +- > test/lua-Harness-tests/305-utf8.t | 2 +- > test/lua-Harness-tests/306-table.t | 2 +- > test/lua-Harness-tests/307-math.t | 2 +- > test/lua-Harness-tests/308-io.t | 2 +- > test/lua-Harness-tests/309-os.t | 2 +- > test/lua-Harness-tests/310-debug.t | 2 +- > test/lua-Harness-tests/311-bit32.t | 2 +- > test/lua-Harness-tests/314-regex.t | 2 +- > test/lua-Harness-tests/320-stdin.t | 2 +- > test/lua-Harness-tests/401-bitop.t | 2 +- > test/lua-Harness-tests/402-ffi.t | 2 +- > test/lua-Harness-tests/403-jit.t | 2 +- > test/lua-Harness-tests/404-ext.t | 2 +- > test/lua-Harness-tests/411-luajit.t | 2 +- > test/lua-Harness-tests/CMakeLists.txt | 17 +++++++++++++++-- > .../{tap.lua =3D> tap_harness.lua} | 0 > 46 files changed, 77 insertions(+), 56 deletions(-) > rename test/lua-Harness-tests/{tap.lua =3D> tap_harness.lua} (100%) >=20 > diff --git a/.gitignore b/.gitignore > index 2103a30..1fb81bc 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -20,3 +20,4 @@ compile_commands.json > install_manifest.txt > luajit-parse-memprof > luajit.pc > +tests_list > diff --git a/test/lua-Harness-tests/090-tap.t = b/test/lua-Harness-tests/090-tap.t > index 92f04d8..99932f2 100755 > --- a/test/lua-Harness-tests/090-tap.t > +++ b/test/lua-Harness-tests/090-tap.t > @@ -22,7 +22,7 @@ >=20 > ]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(3) > ok( true, 'ok' ) > diff --git a/test/lua-Harness-tests/091-profile.t = b/test/lua-Harness-tests/091-profile.t > index db47438..ebc142d 100755 > --- a/test/lua-Harness-tests/091-profile.t > +++ b/test/lua-Harness-tests/091-profile.t > @@ -22,7 +22,7 @@ >=20 > ]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan'no_plan' >=20 > diff --git a/test/lua-Harness-tests/101-boolean.t = b/test/lua-Harness-tests/101-boolean.t > index 0033eff..653509f 100755 > --- a/test/lua-Harness-tests/101-boolean.t > +++ b/test/lua-Harness-tests/101-boolean.t > @@ -22,7 +22,7 @@ >=20 > ]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/102-function.t = b/test/lua-Harness-tests/102-function.t > index 48ed814..cb7e9d0 100755 > --- a/test/lua-Harness-tests/102-function.t > +++ b/test/lua-Harness-tests/102-function.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/103-nil.t = b/test/lua-Harness-tests/103-nil.t > index 561b101..a74c491 100755 > --- a/test/lua-Harness-tests/103-nil.t > +++ b/test/lua-Harness-tests/103-nil.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/104-number.t = b/test/lua-Harness-tests/104-number.t > index 0d4d3fd..634d22a 100755 > --- a/test/lua-Harness-tests/104-number.t > +++ b/test/lua-Harness-tests/104-number.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > diff --git a/test/lua-Harness-tests/105-string.t = b/test/lua-Harness-tests/105-string.t > index cd8c88b..f2ea067 100755 > --- a/test/lua-Harness-tests/105-string.t > +++ b/test/lua-Harness-tests/105-string.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > diff --git a/test/lua-Harness-tests/106-table.t = b/test/lua-Harness-tests/106-table.t > index 0c0ba49..4a66f69 100755 > --- a/test/lua-Harness-tests/106-table.t > +++ b/test/lua-Harness-tests/106-table.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/107-thread.t = b/test/lua-Harness-tests/107-thread.t > index 3d4af18..e67ef36 100755 > --- a/test/lua-Harness-tests/107-thread.t > +++ b/test/lua-Harness-tests/107-thread.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/108-userdata.t = b/test/lua-Harness-tests/108-userdata.t > index b1e3641..687b1b8 100755 > --- a/test/lua-Harness-tests/108-userdata.t > +++ b/test/lua-Harness-tests/108-userdata.t > @@ -22,7 +22,7 @@ >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_op53 =3D _VERSION >=3D 'Lua 5.3' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/200-examples.t = b/test/lua-Harness-tests/200-examples.t > index 362aae3..cb06a80 100755 > --- a/test/lua-Harness-tests/200-examples.t > +++ b/test/lua-Harness-tests/200-examples.t > @@ -24,7 +24,7 @@ First tests in order to check infrastructure. >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(5) >=20 > diff --git a/test/lua-Harness-tests/201-assign.t = b/test/lua-Harness-tests/201-assign.t > index 7d023d8..f7ed472 100755 > --- a/test/lua-Harness-tests/201-assign.t > +++ b/test/lua-Harness-tests/201-assign.t > @@ -28,7 +28,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_env =3D _VERSION >=3D 'Lua 5.2' >=20 > plan'no_plan' > diff --git a/test/lua-Harness-tests/202-expr.t = b/test/lua-Harness-tests/202-expr.t > index 2576750..f03d5ea 100755 > --- a/test/lua-Harness-tests/202-expr.t > +++ b/test/lua-Harness-tests/202-expr.t > @@ -28,7 +28,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local nocvtn2s =3D profile.nocvtn2s > local nocvts2n =3D profile.nocvts2n > diff --git a/test/lua-Harness-tests/203-lexico.t = b/test/lua-Harness-tests/203-lexico.t > index c1abebf..0a73f8c 100755 > --- a/test/lua-Harness-tests/203-lexico.t > +++ b/test/lua-Harness-tests/203-lexico.t > @@ -31,7 +31,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local loadstring =3D loadstring or load > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') >=20 > @@ -117,20 +117,24 @@ do > like(msg, "^[^:]+:%d+: unfinished long comment .-near") > end >=20 > +-- Adapt tests for testing with Tarantool's out of source build > +-- on read only file system. CUR_SOURCE_DIR is set via CMake. > +local path_to_sources =3D os.getenv('CUR_SOURCE_DIR') .. '/' > + > if _VERSION >=3D 'Lua 5.2' or jit then > - dofile'lexico52/lexico.t' > + dofile(path_to_sources .. 'lexico52/lexico.t') > end >=20 > if _VERSION >=3D 'Lua 5.3' or luajit21 then > - dofile'lexico53/lexico.t' > + dofile(path_to_sources .. 'lexico53/lexico.t') > end >=20 > if _VERSION >=3D 'Lua 5.4' then > - dofile'lexico54/lexico.t' > + dofile(path_to_sources .. 'lexico54/lexico.t') > end >=20 > if jit and pcall(require, 'ffi') then > - dofile'lexicojit/lexico.t' > + dofile(path_to_sources .. 'lexicojit/lexico.t') > end >=20 > done_testing() > diff --git a/test/lua-Harness-tests/204-grammar.t = b/test/lua-Harness-tests/204-grammar.t > index d9ae3a6..03580f4 100755 > --- a/test/lua-Harness-tests/204-grammar.t > +++ b/test/lua-Harness-tests/204-grammar.t > @@ -28,7 +28,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_goto =3D _VERSION >=3D 'Lua 5.2' or jit > local has_attr =3D _VERSION >=3D 'Lua 5.4' > diff --git a/test/lua-Harness-tests/211-scope.t = b/test/lua-Harness-tests/211-scope.t > index 64eed52..8e26a6f 100755 > --- a/test/lua-Harness-tests/211-scope.t > +++ b/test/lua-Harness-tests/211-scope.t > @@ -30,7 +30,7 @@ See section "Local Variables and Blocks" in = "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(10) >=20 > diff --git a/test/lua-Harness-tests/212-function.t = b/test/lua-Harness-tests/212-function.t > index 2851053..405035e 100755 > --- a/test/lua-Harness-tests/212-function.t > +++ b/test/lua-Harness-tests/212-function.t > @@ -30,7 +30,7 @@ See section "Functions" in "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local loadstring =3D loadstring or load >=20 > plan(68) > diff --git a/test/lua-Harness-tests/213-closure.t = b/test/lua-Harness-tests/213-closure.t > index fc3bd29..16a8a21 100755 > --- a/test/lua-Harness-tests/213-closure.t > +++ b/test/lua-Harness-tests/213-closure.t > @@ -24,7 +24,7 @@ See section "Closures" in "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(15) >=20 > diff --git a/test/lua-Harness-tests/214-coroutine.t = b/test/lua-Harness-tests/214-coroutine.t > index 92929e1..1ca1cb5 100755 > --- a/test/lua-Harness-tests/214-coroutine.t > +++ b/test/lua-Harness-tests/214-coroutine.t > @@ -30,7 +30,7 @@ See section "Coroutines" in "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > local has_coroutine52 =3D _VERSION >=3D 'Lua 5.2' or jit > diff --git a/test/lua-Harness-tests/221-table.t = b/test/lua-Harness-tests/221-table.t > index c064a33..07ac952 100755 > --- a/test/lua-Harness-tests/221-table.t > +++ b/test/lua-Harness-tests/221-table.t > @@ -24,7 +24,7 @@ See section "Tables" in "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(25) >=20 > diff --git a/test/lua-Harness-tests/222-constructor.t = b/test/lua-Harness-tests/222-constructor.t > index a01be2e..28037bf 100755 > --- a/test/lua-Harness-tests/222-constructor.t > +++ b/test/lua-Harness-tests/222-constructor.t > @@ -30,7 +30,7 @@ See section "Table Constructors" in "Programming in = Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(16) >=20 > diff --git a/test/lua-Harness-tests/223-iterator.t = b/test/lua-Harness-tests/223-iterator.t > index 777ad73..073f3cd 100755 > --- a/test/lua-Harness-tests/223-iterator.t > +++ b/test/lua-Harness-tests/223-iterator.t > @@ -25,7 +25,7 @@ section "Coroutines as Iterators" in "Programming in = Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(8) >=20 > diff --git a/test/lua-Harness-tests/231-metatable.t = b/test/lua-Harness-tests/231-metatable.t > index a2c6499..b94f608 100755 > --- a/test/lua-Harness-tests/231-metatable.t > +++ b/test/lua-Harness-tests/231-metatable.t > @@ -30,7 +30,7 @@ See section "Metatables and Metamethods" in = "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_metamethod52 =3D _VERSION >=3D 'Lua 5.2' or = profile.luajit_compat52 > local has_metamethod_ipairs =3D _VERSION =3D=3D 'Lua 5.2' or = profile.compat52 or profile.luajit_compat52 > diff --git a/test/lua-Harness-tests/232-object.t = b/test/lua-Harness-tests/232-object.t > index 0d87572..0d22232 100755 > --- a/test/lua-Harness-tests/232-object.t > +++ b/test/lua-Harness-tests/232-object.t > @@ -24,7 +24,7 @@ See section "Object-Oriented Programming" in = "Programming in Lua". >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > plan(18) >=20 > diff --git a/test/lua-Harness-tests/241-standalone.t = b/test/lua-Harness-tests/241-standalone.t > index c5237ee..33d5159 100755 > --- a/test/lua-Harness-tests/241-standalone.t > +++ b/test/lua-Harness-tests/241-standalone.t > @@ -28,7 +28,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local has_bytecode =3D not ujit and not ravi > local has_error52 =3D _VERSION >=3D 'Lua 5.2' > local has_error53 =3D _VERSION >=3D 'Lua 5.3' > @@ -228,14 +228,14 @@ end > like(f:read'*l', "^usage: ", "no file") > f:close() >=20 > -cmd =3D lua .. [[ -ltap -e "print(type(ok))"]] > +cmd =3D lua .. [[ -ltap_harness -e "print(type(ok))"]] > f =3D io.popen(cmd) > -is(f:read'*l', 'function', "-ltap") > +is(f:read'*l', 'function', "-ltap_harness") > f:close() >=20 > -cmd =3D lua .. [[ -l tap -e "print(type(ok))"]] > +cmd =3D lua .. [[ -l tap_harness -e "print(type(ok))"]] > f =3D io.popen(cmd) > -is(f:read'*l', 'function', "-l tap") > +is(f:read'*l', 'function', "-l tap_harness") > f:close() >=20 > cmd =3D lua .. [[ -l lpeg -e "print(1)" 2>&1]] > diff --git a/test/lua-Harness-tests/242-luac.t = b/test/lua-Harness-tests/242-luac.t > index a95a334..9a3a3c3 100755 > --- a/test/lua-Harness-tests/242-luac.t > +++ b/test/lua-Harness-tests/242-luac.t > @@ -28,7 +28,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > if jit then > skip_all("LuaJIT") > diff --git a/test/lua-Harness-tests/301-basic.t = b/test/lua-Harness-tests/301-basic.t > index f4f9235..13472cd 100755 > --- a/test/lua-Harness-tests/301-basic.t > +++ b/test/lua-Harness-tests/301-basic.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_error53 =3D _VERSION >=3D 'Lua 5.3' > local has_gcinfo =3D _VERSION =3D=3D 'Lua 5.1' > @@ -843,7 +843,10 @@ do -- xpcall > end >=20 > if jit and pcall(require, 'ffi') then > - dofile'lexicojit/basic.t' > + -- Adapt test for testing with Tarantool's out of source build > + -- on read only file system. CUR_SOURCE_DIR is set via CMake. > + local path_to_sources =3D os.getenv('CUR_SOURCE_DIR') > + dofile(path_to_sources .. '/lexicojit/basic.t') > end >=20 > done_testing() > diff --git a/test/lua-Harness-tests/303-package.t = b/test/lua-Harness-tests/303-package.t > index 7e5216d..996ce22 100755 > --- a/test/lua-Harness-tests/303-package.t > +++ b/test/lua-Harness-tests/303-package.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > local has_loaders =3D _VERSION =3D=3D 'Lua 5.1' > @@ -130,9 +130,9 @@ end >=20 > -- searchpath > if has_searcherpath then > - local p =3D package.searchpath('tap', package.path) > + local p =3D package.searchpath('tap_harness', package.path) > type_ok(p, 'string', "searchpath") > - p =3D package.searchpath('tap', 'bad path') > + p =3D package.searchpath('tap_harness', 'bad path') > is(p, nil) > else > is(package.searchpath, nil, "no package.searchpath") > diff --git a/test/lua-Harness-tests/304-string.t = b/test/lua-Harness-tests/304-string.t > index 991600a..293fd8e 100755 > --- a/test/lua-Harness-tests/304-string.t > +++ b/test/lua-Harness-tests/304-string.t > @@ -30,7 +30,7 @@ L >=20 > ]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > local has_dump53 =3D _VERSION >=3D 'Lua 5.3' or jit > diff --git a/test/lua-Harness-tests/305-utf8.t = b/test/lua-Harness-tests/305-utf8.t > index 4304b6c..59a2e6b 100755 > --- a/test/lua-Harness-tests/305-utf8.t > +++ b/test/lua-Harness-tests/305-utf8.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' >=20 > local profile =3D require'profile' > local has_utf8 =3D _VERSION >=3D 'Lua 5.3' or (jit and = jit.version:match'moonjit') or profile.utf8 > diff --git a/test/lua-Harness-tests/306-table.t = b/test/lua-Harness-tests/306-table.t > index 9836655..6e76492 100755 > --- a/test/lua-Harness-tests/306-table.t > +++ b/test/lua-Harness-tests/306-table.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > local has_foreach =3D _VERSION =3D=3D 'Lua 5.1' > diff --git a/test/lua-Harness-tests/307-math.t = b/test/lua-Harness-tests/307-math.t > index 8b51ed1..762567f 100755 > --- a/test/lua-Harness-tests/307-math.t > +++ b/test/lua-Harness-tests/307-math.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_integer =3D _VERSION >=3D 'Lua 5.3' or (jit and = jit.version:match'moonjit') or profile.integer > local has_mathx =3D _VERSION < 'Lua 5.3' or profile.compat52 or = profile.compat53 or profile.has_mathx > diff --git a/test/lua-Harness-tests/308-io.t = b/test/lua-Harness-tests/308-io.t > index 35d39c0..1945ce3 100755 > --- a/test/lua-Harness-tests/308-io.t > +++ b/test/lua-Harness-tests/308-io.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > local has_write51 =3D _VERSION =3D=3D 'Lua 5.1' and (not = profile.luajit_compat52 or ujit) > diff --git a/test/lua-Harness-tests/309-os.t = b/test/lua-Harness-tests/309-os.t > index a787b14..f94db00 100755 > --- a/test/lua-Harness-tests/309-os.t > +++ b/test/lua-Harness-tests/309-os.t > @@ -30,7 +30,7 @@ L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' > local luajit20 =3D jit and (jit.version_num < 20100 and not = jit.version:match'^RaptorJIT') > local has_execute51 =3D _VERSION =3D=3D 'Lua 5.1' and (not = profile.luajit_compat52 or ujit) > diff --git a/test/lua-Harness-tests/310-debug.t = b/test/lua-Harness-tests/310-debug.t > index f78af03..63194ac 100755 > --- a/test/lua-Harness-tests/310-debug.t > +++ b/test/lua-Harness-tests/310-debug.t > @@ -30,7 +30,7 @@ L >=20 > ]] >=20 > -require 'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_getfenv =3D _VERSION =3D=3D 'Lua 5.1' > local has_gethook54 =3D _VERSION >=3D 'Lua 5.4' > diff --git a/test/lua-Harness-tests/311-bit32.t = b/test/lua-Harness-tests/311-bit32.t > index 7023906..a314f47 100755 > --- a/test/lua-Harness-tests/311-bit32.t > +++ b/test/lua-Harness-tests/311-bit32.t > @@ -29,7 +29,7 @@ L >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' > local profile =3D require'profile' > local has_bit32 =3D _VERSION =3D=3D 'Lua 5.2' or profile.compat52 or = profile.has_bit32 >=20 > diff --git a/test/lua-Harness-tests/314-regex.t = b/test/lua-Harness-tests/314-regex.t > index ad4554c..ac7ad80 100755 > --- a/test/lua-Harness-tests/314-regex.t > +++ b/test/lua-Harness-tests/314-regex.t > @@ -49,7 +49,7 @@ Description of the test. >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local loadstring =3D loadstring or load >=20 > plan(162) > diff --git a/test/lua-Harness-tests/320-stdin.t = b/test/lua-Harness-tests/320-stdin.t > index 4828285..a0eabcb 100755 > --- a/test/lua-Harness-tests/320-stdin.t > +++ b/test/lua-Harness-tests/320-stdin.t > @@ -24,7 +24,7 @@ Tests Lua Basic & IO Libraries with stdin >=20 > --]] >=20 > -require'tap' > +require'tap_harness' >=20 > local lua =3D get_lua_binary_name() >=20 > diff --git a/test/lua-Harness-tests/401-bitop.t = b/test/lua-Harness-tests/401-bitop.t > index f95aebf..d1225bd 100755 > --- a/test/lua-Harness-tests/401-bitop.t > +++ b/test/lua-Harness-tests/401-bitop.t > @@ -24,7 +24,7 @@ See L. >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' >=20 > if not jit then > skip_all("only with LuaJIT") > diff --git a/test/lua-Harness-tests/402-ffi.t = b/test/lua-Harness-tests/402-ffi.t > index a2e32a5..2423b2e 100755 > --- a/test/lua-Harness-tests/402-ffi.t > +++ b/test/lua-Harness-tests/402-ffi.t > @@ -24,7 +24,7 @@ See L. >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' >=20 > if not jit then > skip_all("only with LuaJIT") > diff --git a/test/lua-Harness-tests/403-jit.t = b/test/lua-Harness-tests/403-jit.t > index 0073c90..6c0870a 100755 > --- a/test/lua-Harness-tests/403-jit.t > +++ b/test/lua-Harness-tests/403-jit.t > @@ -24,7 +24,7 @@ See L. >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' > local profile =3D require'profile' >=20 > if not jit then > diff --git a/test/lua-Harness-tests/404-ext.t = b/test/lua-Harness-tests/404-ext.t > index 22a52c7..906ed51 100755 > --- a/test/lua-Harness-tests/404-ext.t > +++ b/test/lua-Harness-tests/404-ext.t > @@ -24,7 +24,7 @@ See L. >=20 > --]] >=20 > -require 'tap' > +require'tap_harness' > local profile =3D require'profile' >=20 > local luajit21 =3D jit and (jit.version_num >=3D 20100 or = jit.version:match'^RaptorJIT') > diff --git a/test/lua-Harness-tests/411-luajit.t = b/test/lua-Harness-tests/411-luajit.t > index feb752e..b8cb547 100755 > --- a/test/lua-Harness-tests/411-luajit.t > +++ b/test/lua-Harness-tests/411-luajit.t > @@ -24,7 +24,7 @@ See L >=20 > --]] >=20 > -require'tap' > +require'tap_harness' > local profile =3D require'profile' >=20 > if not jit or ujit then > diff --git a/test/lua-Harness-tests/CMakeLists.txt = b/test/lua-Harness-tests/CMakeLists.txt > index 9b35e5a..e28cadd 100644 > --- a/test/lua-Harness-tests/CMakeLists.txt > +++ b/test/lua-Harness-tests/CMakeLists.txt > @@ -26,7 +26,17 @@ string(CONCAT LUA_CPATH > "${LUAJIT_SOURCE_DIR}/?${CMAKE_SHARED_LIBRARY_SUFFIX}\;" > ) >=20 > -add_custom_target(lua-Harness-tests DEPENDS ${LUAJIT_TEST_BINARY}) > +# FIXME: Until https://github.com/tarantool/tarantool/issues/5040 > +# is resolved, Tarantool enters interactive mode if prove input > +# is not stdin. As a result test hungs and not run at all. > +# This part should be dropped, and argument to prove is passed > +# as directory. > +file(GLOB TESTS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/*.t) > +string(REPLACE ";" "\n" TESTS_LIST "${TESTS_LIST}") > +set(LIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/tests_list) > +file(WRITE ${LIST_FILE} ${TESTS_LIST}) > + > +add_custom_target(lua-Harness-tests DEPENDS ${LUAJIT_TEST_BINARY} = ${LIST_FILE}) >=20 > add_custom_command(TARGET lua-Harness-tests > COMMENT "Running lua-Harness tests" > @@ -40,7 +50,10 @@ add_custom_command(TARGET lua-Harness-tests > # for more info. > # So use less preferable way for tests. > # See the root CMakeLists.txt for more info. > - ${PROVE} ${CMAKE_CURRENT_SOURCE_DIR} > + # XXX: Adapt to run test witht Tarantool on read-only > + # file systems with dofile(CUR_SOURCE_DIR..filename). > + CUR_SOURCE_DIR=3D${CMAKE_CURRENT_SOURCE_DIR} > + ${PROVE} - < ${LIST_FILE} > --exec '${LUAJIT_TEST_COMMAND} -l profile_luajit21' > ${LUA_TEST_FLAGS} > WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} > diff --git a/test/lua-Harness-tests/tap.lua = b/test/lua-Harness-tests/tap_harness.lua > similarity index 100% > rename from test/lua-Harness-tests/tap.lua > rename to test/lua-Harness-tests/tap_harness.lua > --=20 > 2.28.0 >=20