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 1DEB6ED591A; Thu, 6 Jun 2024 17:01:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1DEB6ED591A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1717682510; bh=4DnBkmmeib0l3kWN7GWzOyvlyL6AcXBDdF9gwJOmY8Y=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=imHVGMiJAr7uPP/iYNuhFYCWcimi5fs+mUlueY+sggP/Zmz7Is8vStWbcrKBetZdG A4s4XvuNSAv/wUazvV5ou7JCRFsTgdJYR2XmqVaJbyofYuo4rxSSRqsGdBGMU05VyB dWmdAuiD872WLqhkSBxBGE47CYZo06mzEdE6u7Do= Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 64F38ED5900 for ; Thu, 6 Jun 2024 17:01:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 64F38ED5900 Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2e73359b900so11190981fa.2 for ; Thu, 06 Jun 2024 07:01:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717682508; x=1718287308; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iCpBaKeAd7aLlQjRohQl8ojkFoRrDxTFhOgqqd61Qv4=; b=G0uZd16Vt30uekzRG+9IjcrorjLJ6sekTlM7xcX2ut5n9RUk1Z+ifxGiJ+uGjj+OAx v6dAMtR7KLRLHa3o46GeBoiqx5QYnLrWYPip0LQEXaXGhidj0hMKz037gugAt7ZwvLqb FwS+UqKaQJxpREtdjom3bWOXH0YEabzGyvjDOTm3JoVDBxKpV+wWIBJmJ3xMRMR2CEuo T0Ic4U5gNVUFmKT98Nc8g76jvNiFUOtIpdyEwkAwU0wzXCt+iUcpRdZEnWJpS7BSicFF vxppiLGR6ZFKoq2JZE1H99YknGOeFXo9zoLEOpfTAK27b97pFxlqrZrBS70yev4G2UMo tFYg== X-Gm-Message-State: AOJu0YzXpHMfAWDoXndAkOQQqysVjPLZC9QdTVFcowd4pU0bIfZWH4Ja v4VH/egrn6qqjvByL8fVPPr8GtxUIB7DDGWq6R2gGqBxJDEgjRKDx2ygrafh X-Google-Smtp-Source: AGHT+IH6N1co05fSGTYSEvpfoJyhkrBr9yr7IIEQMO1phUBMpfTabxDaSDKsx19sqrIP9+aHLN/Mig== X-Received: by 2002:a2e:7a0a:0:b0:2da:b59c:a94b with SMTP id 38308e7fff4ca-2eac7a2299fmr37308481fa.25.1717682507915; Thu, 06 Jun 2024 07:01:47 -0700 (PDT) Received: from pony.mail.msk ([5.181.62.98]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ead41bfd29sm2053301fa.116.2024.06.06.07.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 07:01:47 -0700 (PDT) To: tarantool-patches@dev.tarantool.org, Sergey Kaplun , Maxim Kokryashkin Date: Thu, 6 Jun 2024 17:00:54 +0300 Message-Id: <88eab16fca9056a057df5506a0af637c8d4a0ffd.1717682341.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit] test: remove inline suppressions of _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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Sergey Bronnikov The patch defines _TARANTOOL as a global in luacheck configuration file and removes inline suppressions in test files. --- Branch: https://github.com/tarantool/luajit/tree/ligurio/fix-_TARANTOOL .luacheckrc | 2 +- test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua | 1 - test/tarantool-tests/gh-5688-tool-cli-flag.test.lua | 1 - test/tarantool-tests/gh-5994-memprof-human-readable.test.lua | 1 - test/tarantool-tests/gh-7745-oom-on-trace.test.lua | 1 - .../gh-9217-profile-parsers-error-handling.test.lua | 1 - .../lj-1108-fix-dangling-reference-to-ctype.test.lua | 1 - test/tarantool-tests/lj-549-bytecode-loader.test.lua | 1 - test/tarantool-tests/lj-551-bytecode-c-broken-macro.test.lua | 1 - test/tarantool-tests/lj-603-err-snap-restore.test.lua | 1 - test/tarantool-tests/lj-802-panic-at-mcode-protfail.test.lua | 1 - .../lj-920-fix-dangling-reference-to-ctype.test.lua | 1 - 12 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index a32012ca..62ceeaa2 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,7 +1,7 @@ -- Use the default LuaJIT globals. std = 'luajit' -- This fork also introduces a new global for misc API namespace. -read_globals = { 'misc' } +read_globals = { 'misc', '_TARANTOOL' } -- These files are inherited from the vanilla LuaJIT or different -- test suites and need to be coherent with the upstream. diff --git a/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua b/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua index 2ced5779..2c9d6999 100644 --- a/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua +++ b/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua @@ -1,7 +1,6 @@ local tap = require('tap') local ffi = require('ffi') local test = tap.test('fix-dangling-reference-to-ctype'):skipcond({ - -- luacheck: no global ['Impossible to predict the value of cts->top'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua b/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua index 8ead83b5..dd0fd260 100644 --- a/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua +++ b/test/tarantool-tests/gh-5688-tool-cli-flag.test.lua @@ -4,7 +4,6 @@ local test = tap.test('gh-5688-tool-cli-flag'):skipcond({ jit.arch ~= 'x64', ['Profile tools are implemented for Linux only'] = jit.os ~= 'Linux', -- XXX: Tarantool integration is required to run this test properly. - -- luacheck: no global ['No profile tools CLI option integration'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/gh-5994-memprof-human-readable.test.lua b/test/tarantool-tests/gh-5994-memprof-human-readable.test.lua index e34291be..7c3ff94d 100644 --- a/test/tarantool-tests/gh-5994-memprof-human-readable.test.lua +++ b/test/tarantool-tests/gh-5994-memprof-human-readable.test.lua @@ -4,7 +4,6 @@ local test = tap.test('gh-5994-memprof-human-readable'):skipcond({ jit.arch ~= 'x64', ['Profile tools are implemented for Linux only'] = jit.os ~= 'Linux', -- XXX: Tarantool integration is required to run this test properly. - -- luacheck: no global ['No profile tools CLI option integration'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/gh-7745-oom-on-trace.test.lua b/test/tarantool-tests/gh-7745-oom-on-trace.test.lua index 9ac41ac7..fe320251 100644 --- a/test/tarantool-tests/gh-7745-oom-on-trace.test.lua +++ b/test/tarantool-tests/gh-7745-oom-on-trace.test.lua @@ -2,7 +2,6 @@ local tap = require('tap') local ffi = require('ffi') local test = tap.test('OOM on trace'):skipcond({ - -- luacheck: no global ['Broken unwiding in tarantool_panic_handler'] = _TARANTOOL and (jit.os == 'OSX'), ['Disabled on MacOS due to #8652'] = jit.os == 'OSX', diff --git a/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua index 0b7ee2dd..92f9f59d 100644 --- a/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua +++ b/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua @@ -4,7 +4,6 @@ local test = tap.test('gh-9217-profile-parsers-error-handling'):skipcond({ jit.arch ~= 'x64', ['Profile tools are implemented for Linux only'] = jit.os ~= 'Linux', -- XXX: Tarantool integration is required to run this test properly. - -- luacheck: no global ['No profile tools CLI option integration'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/lj-1108-fix-dangling-reference-to-ctype.test.lua b/test/tarantool-tests/lj-1108-fix-dangling-reference-to-ctype.test.lua index a077344e..e1649aa8 100644 --- a/test/tarantool-tests/lj-1108-fix-dangling-reference-to-ctype.test.lua +++ b/test/tarantool-tests/lj-1108-fix-dangling-reference-to-ctype.test.lua @@ -1,7 +1,6 @@ local tap = require('tap') local ffi = require('ffi') local test = tap.test('lj-1108-fix-dangling-reference-to-ctype'):skipcond({ - -- luacheck: no global ['Impossible to predict the value of cts->top'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/lj-549-bytecode-loader.test.lua b/test/tarantool-tests/lj-549-bytecode-loader.test.lua index 76538b58..55185f26 100644 --- a/test/tarantool-tests/lj-549-bytecode-loader.test.lua +++ b/test/tarantool-tests/lj-549-bytecode-loader.test.lua @@ -3,7 +3,6 @@ local test = tap.test('lj-549-bytecode-loader'):skipcond({ -- XXX: Tarantool doesn't use default LuaJIT loaders, and Lua -- bytecode can't be loaded from the shared library. For more -- info: https://github.com/tarantool/tarantool/issues/9671. - -- luacheck: no global ['Test uses exotic type of loaders (see #9671)'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/lj-551-bytecode-c-broken-macro.test.lua b/test/tarantool-tests/lj-551-bytecode-c-broken-macro.test.lua index 4c4a1b25..2641140e 100644 --- a/test/tarantool-tests/lj-551-bytecode-c-broken-macro.test.lua +++ b/test/tarantool-tests/lj-551-bytecode-c-broken-macro.test.lua @@ -3,7 +3,6 @@ local test = tap.test('lj-551-bytecode-c-broken-macro'):skipcond({ -- XXX: Tarantool doesn't use default LuaJIT loaders, and Lua -- bytecode can't be loaded from the shared library. For more -- info: https://github.com/tarantool/tarantool/issues/9671. - -- luacheck: no global ['Test uses exotic type of loaders (see #9671)'] = _TARANTOOL, }) diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua index f5c8474f..d11d474e 100644 --- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua +++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua @@ -34,7 +34,6 @@ local function do_test() ['Disabled on *BSD due to #4819'] = jit.os == 'BSD', -- XXX: The different amount of stack slots is in-use for -- Tarantool at start, so just skip test for it. - -- luacheck: no global ['Disable test for Tarantool'] = _TARANTOOL, ['Stack overflow is now handled differently'] = true, }) diff --git a/test/tarantool-tests/lj-802-panic-at-mcode-protfail.test.lua b/test/tarantool-tests/lj-802-panic-at-mcode-protfail.test.lua index 94f4314f..90ff723c 100644 --- a/test/tarantool-tests/lj-802-panic-at-mcode-protfail.test.lua +++ b/test/tarantool-tests/lj-802-panic-at-mcode-protfail.test.lua @@ -7,7 +7,6 @@ local test = tap.test('lj-flush-on-trace'):skipcond({ -- purpose. However, is widely used in Tarantool -- to play with fiber stacks, so overriding is not -- suitable to test this feature in Tarantool. - -- luacheck: no global [' overriding can break Tarantool'] = _TARANTOOL, -- XXX: Unfortunately, it's too hard to overload (or even -- impossible, who knows, since Cupertino fellows do not diff --git a/test/tarantool-tests/lj-920-fix-dangling-reference-to-ctype.test.lua b/test/tarantool-tests/lj-920-fix-dangling-reference-to-ctype.test.lua index 0b8be04f..67ca61bb 100644 --- a/test/tarantool-tests/lj-920-fix-dangling-reference-to-ctype.test.lua +++ b/test/tarantool-tests/lj-920-fix-dangling-reference-to-ctype.test.lua @@ -2,7 +2,6 @@ local tap = require('tap') local ffi = require('ffi') local test = tap.test('lj-920-fix-dangling-reference-to-ctype'):skipcond({ ['Test requires JIT enabled'] = not jit.status(), - -- luacheck: no global ['Impossible to predict the value of cts->top'] = _TARANTOOL, }) -- 2.34.1