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 687786BD36; Fri, 26 Mar 2021 10:46:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 687786BD36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616744770; bh=pxiGg4oAjw8s2xZKHU3LjprvBVHdoLFnacNO//DFYjg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kL6SOlwP/eJdudamviEnbzM9vyn0hAPzomTXLAPWq6ab2hIo0FGKIzRPlJEpC03Ha OkMGrGqIYsQ54ziJx/Wvfelgo/hqBldkFCAwPK4QSeDyhJQDvx2AZSE6bXvBdjYUYm 4m2AJggsCxHG4QhPqXQYG+W+hiO8JH1rxYGt7Es8= Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (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 29DA86BD38 for ; Fri, 26 Mar 2021 10:44:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 29DA86BD38 Received: by smtp63.i.mail.ru with esmtpa (envelope-from ) id 1lPh8b-00042u-Nz; Fri, 26 Mar 2021 10:44:10 +0300 To: Sergey Ostanevich , Igor Munkin Date: Fri, 26 Mar 2021 10:42:46 +0300 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9064ADF4728AA0EE9AECA9F3C9C9885BEE78E91CF33279E24182A05F53808504043FD772ABD45E4A85A23EAF85C9FCCFB3C53F3F372CA8CCFABD34BD09F08A2CA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F6EE1C40B2E8BE15EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375FE8AD9F0D2764EB8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C5DD32608FC869F5D79D9FBA60F4D0E81C5F70073B80E8678A471835C12D1D9774AD6D5ED66289B5259CC434672EE6371117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE71AE4D56B06699BBC9FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA71A620F70A64A45A98AA50765F790063735872C767BF85DA227C277FBC8AE2E8BE355FB2A6EFF69C575ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831181D79FD8B28A835D792DD908DDF4B51 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C5DD32608FC869F5D79D9FBA60F4D0E81C5F70073B80E86789C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFF532FBFD8162E58C699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34351729636A02D1DEA3B84D84342C474B01CD41D3D4332262572A45FAC84B7B312025C58E8397C8781D7E09C32AA3244C2A91D56861B5F53C843E7E858AAC3BDF8580396430872480927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojapPp7P/VpAg7UBa70SVpSg== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB4267075CF515FA239C37CE200D0FCECB77392DF524794EFEEF2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 03/30] test: adapt Lua 5.1 suite for out-of-source build 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" When tests are run out-of-source redefined `dofile()` function failed to find file to load. So, fullpath is detected considering `arg[0]` value. Moreover, some tests use `loadfile()` instead, so their argument is adjusted to the full path to the files. However, test in creates a temporary file and executes it via `dofile()` too, so this case is handled by the second argument -- `prefix` equals an empty string for current working directory. Part of tarantool/tarantool#5845 Part of tarantool/tarantool#4473 --- test/PUC-Lua-5.1-tests/all.lua | 17 +++++++++++++---- test/PUC-Lua-5.1-tests/verybig.lua | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/test/PUC-Lua-5.1-tests/all.lua b/test/PUC-Lua-5.1-tests/all.lua index 8c4afac..85beff8 100755 --- a/test/PUC-Lua-5.1-tests/all.lua +++ b/test/PUC-Lua-5.1-tests/all.lua @@ -58,9 +58,18 @@ end -- -- redefine dofile to run files through dump/undump -- -dofile = function (n) +-- LuaJIT: Adapt tests for testing with out-of-source build. +-- XXX: Test in creates a temporary file +-- and executes it via `dofile()` too, so this case is handled by +-- the second argument -- `prefix` equals an empty string for +-- current working directory. +-- is in the same directory, where are other common +-- executed files situated. +local path_to_sources = arg[0]:gsub('([^/]+)%.lua$', '') +dofile = function (n, prefix) + local pr = prefix or path_to_sources showmem() - local f = assert(loadfile(n)) + local f = assert(loadfile(pr..n)) local b = string.dump(f) f = assert(loadstring(b)) return f() @@ -77,7 +86,7 @@ do end end -local f = assert(loadfile('gc.lua')) +local f = assert(loadfile(path_to_sources..'gc.lua')) f() dofile('db.lua') assert(dofile('calls.lua') == deep and deep) @@ -88,7 +97,7 @@ assert(dofile('locals.lua') == 5) dofile('constructs.lua') dofile('code.lua') do - local f = coroutine.wrap(assert(loadfile('big.lua'))) + local f = coroutine.wrap(assert(loadfile(path_to_sources..'big.lua'))) assert(f() == 'b') assert(f() == 'a') end diff --git a/test/PUC-Lua-5.1-tests/verybig.lua b/test/PUC-Lua-5.1-tests/verybig.lua index 59e0142..edb170d 100644 --- a/test/PUC-Lua-5.1-tests/verybig.lua +++ b/test/PUC-Lua-5.1-tests/verybig.lua @@ -93,7 +93,9 @@ for s in string.gmatch(prog, "$([^$]+)") do if not n then io.write(s) else F[n]() end end io.close() -result = dofile(file) +-- LuaJIT: Adapt test for testing with out-of-source build. +-- See comment in near `dofile()` redefinition. +result = dofile(file, "") assert(os.remove(file)) print'OK' return result -- 2.31.0