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 68FE86EC56; Tue, 20 Jul 2021 19:28:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 68FE86EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626798518; bh=lYx66vA7MD5HiMkeyI1OpqQEceTFrQUOH1t/eQp9+cc=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YrdIHvvSBoTEfzJGXb1IbPGNl9GF0SXGuomEf3yWX2G5lvp8nEVO7vMpeHfdcOH1w qJgQT019Yl9ENQz+p85ZzUoiZY+tgmYjgyWLCv20n4yIpKa3OreQ4ka0lgdiGXbkcm ok/O6I5f1SM56koh0YEATAin97ymS6JK8uimGkLA= Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 A714B6EC57 for ; Tue, 20 Jul 2021 19:27:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A714B6EC57 Received: by mail-lj1-f175.google.com with SMTP id r16so31795014ljk.9 for ; Tue, 20 Jul 2021 09:27:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XI08wTpzHmKEfDOmgaedievqFCh83/BxeAuD00FM6vU=; b=VwoAA8cgiN+RklrZmMpPkybFalwpCExty7sc+4slYkJBv2numJkhtsgXyoyOfwFG19 kqy5l3iv7CL/J+FGcx6xomsfGqCdl2xQsGSIivYgJnNAskxGSI3YejF/ya7U+qX8SNSz /BOUguTzoKhpl2K+nLXzx4BdaOP+EepIqHXsnclkS8EOb9w/T/kSy562HCOs2Vi9mE1L Ny2PVwEWYRoO9yR3pa+2pW8UohkTsILbKO541bRwCWuxR8LdkyNJWCDujKDP7GemGQ6M 9w6skVuBf8YvlSliFymiNLE6rttkdveC6tIHGt6PFU1u4wnZMrKIko+uVIN06+8n/a9F uviw== X-Gm-Message-State: AOAM530eUzi1iZmInsSTaSdKn1H2xgSWOfltPbruh7hcuYXjqn0Bk8M5 7v32C+m55PpUkG68nej7dgk5WQ2xGH7URm7q X-Google-Smtp-Source: ABdhPJzJsSjxS5yM86pnA7eGAJclCVdstuEI0orI+fvtLWo/JGhY3T+RtTtKVOCu5xqPtXAIg2j07g== X-Received: by 2002:a2e:2404:: with SMTP id k4mr27834301ljk.140.1626798467907; Tue, 20 Jul 2021 09:27:47 -0700 (PDT) Received: from localhost.localdomain ([2a00:1fa0:44c8:ff00:875c:6e54:99e0:fb4a]) by smtp.gmail.com with ESMTPSA id d8sm1562660lfi.129.2021.07.20.09.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 09:27:47 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Date: Tue, 20 Jul 2021 19:26:50 +0300 Message-Id: <1747859587d2d0b8a60aaf239851b8e17fec087e.1626797225.git.m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 02/10] test: rename lua-Harness tap to test_assertion 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" In scope of this patch[1] from lua-Harness assertion module tap.lua is renamed to test_assertion.lua to avoid name collision with Tarantool tap builtin module. [1]: https://framagit.org/fperrad/lua-Harness/-/commit/8041c45 Part of tarantool/tarantool#5970 Part of tarantool/tarantool#4473 --- 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 | 2 +- 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.disabled | 2 +- test/lua-Harness-tests/242-luac.t | 2 +- test/lua-Harness-tests/301-basic.t | 2 +- test/lua-Harness-tests/303-package.t | 8 ++++---- 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.disabled | 2 +- test/lua-Harness-tests/{tap.lua => test_assertion.lua} | 0 44 files changed, 46 insertions(+), 46 deletions(-) rename test/lua-Harness-tests/{tap.lua => test_assertion.lua} (100%) diff --git a/test/lua-Harness-tests/090-tap.t b/test/lua-Harness-tests/090-tap.t index 47a9b613..ff4565a4 100755 --- a/test/lua-Harness-tests/090-tap.t +++ b/test/lua-Harness-tests/090-tap.t @@ -22,7 +22,7 @@ ]] -require'tap' +require'test_assertion' plan(3) truthy( true, 'truthy' ) diff --git a/test/lua-Harness-tests/091-profile.t b/test/lua-Harness-tests/091-profile.t index 53220569..5f4010fc 100755 --- a/test/lua-Harness-tests/091-profile.t +++ b/test/lua-Harness-tests/091-profile.t @@ -22,7 +22,7 @@ ]] -require'tap' +require'test_assertion' plan'no_plan' diff --git a/test/lua-Harness-tests/101-boolean.t b/test/lua-Harness-tests/101-boolean.t index 95a3c0bd..eb8b6bbd 100755 --- a/test/lua-Harness-tests/101-boolean.t +++ b/test/lua-Harness-tests/101-boolean.t @@ -22,7 +22,7 @@ ]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/102-function.t b/test/lua-Harness-tests/102-function.t index 26ced043..a0a3ad33 100755 --- a/test/lua-Harness-tests/102-function.t +++ b/test/lua-Harness-tests/102-function.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/103-nil.t b/test/lua-Harness-tests/103-nil.t index 90a3b4f3..718fde16 100755 --- a/test/lua-Harness-tests/103-nil.t +++ b/test/lua-Harness-tests/103-nil.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/104-number.t b/test/lua-Harness-tests/104-number.t index a41c5951..872042c0 100755 --- a/test/lua-Harness-tests/104-number.t +++ b/test/lua-Harness-tests/104-number.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_op53 = _VERSION >= 'Lua 5.3' diff --git a/test/lua-Harness-tests/105-string.t b/test/lua-Harness-tests/105-string.t index af8c90b7..22e6cfa6 100755 --- a/test/lua-Harness-tests/105-string.t +++ b/test/lua-Harness-tests/105-string.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_op53 = _VERSION >= 'Lua 5.3' diff --git a/test/lua-Harness-tests/106-table.t b/test/lua-Harness-tests/106-table.t index 03d45085..ecb761d2 100755 --- a/test/lua-Harness-tests/106-table.t +++ b/test/lua-Harness-tests/106-table.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/107-thread.t b/test/lua-Harness-tests/107-thread.t index 36003bab..33ebf769 100755 --- a/test/lua-Harness-tests/107-thread.t +++ b/test/lua-Harness-tests/107-thread.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/108-userdata.t b/test/lua-Harness-tests/108-userdata.t index 41b820d3..314a60e7 100755 --- a/test/lua-Harness-tests/108-userdata.t +++ b/test/lua-Harness-tests/108-userdata.t @@ -22,7 +22,7 @@ --]] -require'tap' +require'test_assertion' local has_op53 = _VERSION >= 'Lua 5.3' plan'no_plan' diff --git a/test/lua-Harness-tests/200-examples.t b/test/lua-Harness-tests/200-examples.t index 708ee3bd..7020af4d 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. --]] -require'tap' +require'test_assertion' plan(5) diff --git a/test/lua-Harness-tests/201-assign.t b/test/lua-Harness-tests/201-assign.t index 3e978091..968b019e 100755 --- a/test/lua-Harness-tests/201-assign.t +++ b/test/lua-Harness-tests/201-assign.t @@ -28,7 +28,7 @@ L --]] -require'tap' +require'test_assertion' local has_env = _VERSION >= 'Lua 5.2' plan'no_plan' diff --git a/test/lua-Harness-tests/202-expr.t b/test/lua-Harness-tests/202-expr.t index f86276af..0ac14f28 100755 --- a/test/lua-Harness-tests/202-expr.t +++ b/test/lua-Harness-tests/202-expr.t @@ -28,7 +28,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local nocvtn2s = profile.nocvtn2s local nocvts2n = profile.nocvts2n diff --git a/test/lua-Harness-tests/203-lexico.t b/test/lua-Harness-tests/203-lexico.t index 6143615c..c9345c71 100755 --- a/test/lua-Harness-tests/203-lexico.t +++ b/test/lua-Harness-tests/203-lexico.t @@ -31,7 +31,7 @@ L --]] -require'tap' +require'test_assertion' local loadstring = loadstring or load local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') diff --git a/test/lua-Harness-tests/204-grammar.t b/test/lua-Harness-tests/204-grammar.t index c34fd28c..51671e99 100755 --- a/test/lua-Harness-tests/204-grammar.t +++ b/test/lua-Harness-tests/204-grammar.t @@ -28,7 +28,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_goto = _VERSION >= 'Lua 5.2' or jit local has_attr = _VERSION >= 'Lua 5.4' diff --git a/test/lua-Harness-tests/211-scope.t b/test/lua-Harness-tests/211-scope.t index 2c449ab5..4c25f6e4 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". --]] -require'tap' +require'test_assertion' plan(10) diff --git a/test/lua-Harness-tests/212-function.t b/test/lua-Harness-tests/212-function.t index 8325e79b..28c747e6 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". --]] -require'tap' +require'test_assertion' local loadstring = loadstring or load plan(68) diff --git a/test/lua-Harness-tests/213-closure.t b/test/lua-Harness-tests/213-closure.t index 925a0b84..370f8956 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". --]] -require'tap' +require'test_assertion' plan(15) diff --git a/test/lua-Harness-tests/214-coroutine.t b/test/lua-Harness-tests/214-coroutine.t index 3101f840..372810cf 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". --]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') local has_coroutine52 = _VERSION >= 'Lua 5.2' or jit diff --git a/test/lua-Harness-tests/221-table.t b/test/lua-Harness-tests/221-table.t index 1b4e6ff6..1b8c25a3 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". --]] -require'tap' +require'test_assertion' plan(25) diff --git a/test/lua-Harness-tests/222-constructor.t b/test/lua-Harness-tests/222-constructor.t index ce89b9aa..0a945616 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". --]] -require'tap' +require'test_assertion' plan(16) diff --git a/test/lua-Harness-tests/223-iterator.t b/test/lua-Harness-tests/223-iterator.t index a95fd1fe..588534da 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". --]] -require'tap' +require'test_assertion' plan(8) diff --git a/test/lua-Harness-tests/231-metatable.t b/test/lua-Harness-tests/231-metatable.t index 8d181d0e..15625c11 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". --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_metamethod52 = _VERSION >= 'Lua 5.2' or profile.luajit_compat52 local has_metamethod_ipairs = _VERSION == '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 583e37a6..8c56d3f6 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". --]] -require'tap' +require'test_assertion' plan(18) diff --git a/test/lua-Harness-tests/241-standalone.t.disabled b/test/lua-Harness-tests/241-standalone.t.disabled index deb5421d..a02ed5bf 100755 --- a/test/lua-Harness-tests/241-standalone.t.disabled +++ b/test/lua-Harness-tests/241-standalone.t.disabled @@ -28,7 +28,7 @@ L --]] -require'tap' +require'test_assertion' local has_bytecode = not ujit and not ravi local has_error52 = _VERSION >= 'Lua 5.2' local has_error53 = _VERSION >= 'Lua 5.3' diff --git a/test/lua-Harness-tests/242-luac.t b/test/lua-Harness-tests/242-luac.t index 9efabd01..0a2e160e 100755 --- a/test/lua-Harness-tests/242-luac.t +++ b/test/lua-Harness-tests/242-luac.t @@ -28,7 +28,7 @@ L --]] -require'tap' +require'test_assertion' 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 415cc497..63f0004a 100755 --- a/test/lua-Harness-tests/301-basic.t +++ b/test/lua-Harness-tests/301-basic.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_error53 = _VERSION >= 'Lua 5.3' local has_gcinfo = _VERSION == 'Lua 5.1' diff --git a/test/lua-Harness-tests/303-package.t b/test/lua-Harness-tests/303-package.t index 1a1d7e05..ccd7c510 100755 --- a/test/lua-Harness-tests/303-package.t +++ b/test/lua-Harness-tests/303-package.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') local has_loaders = _VERSION == 'Lua 5.1' @@ -130,10 +130,10 @@ end -- searchpath if has_searcherpath then - local p = package.searchpath('tap', package.path) + local p = package.searchpath('test_assertion', package.path) is_string(p, "searchpath") - matches(p, "tap.lua$", "searchpath") - p = package.searchpath('tap', 'bad path') + matches(p, "test_assertion.lua$", "searchpath") + p = package.searchpath('test_assertion', 'bad path') is_nil(p) else is_nil(package.searchpath, "no package.searchpath") diff --git a/test/lua-Harness-tests/304-string.t b/test/lua-Harness-tests/304-string.t index 7011a88e..82e0408d 100755 --- a/test/lua-Harness-tests/304-string.t +++ b/test/lua-Harness-tests/304-string.t @@ -30,7 +30,7 @@ L ]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') local has_dump53 = _VERSION >= 'Lua 5.3' or jit diff --git a/test/lua-Harness-tests/305-utf8.t b/test/lua-Harness-tests/305-utf8.t index be0ace6e..e448a448 100755 --- a/test/lua-Harness-tests/305-utf8.t +++ b/test/lua-Harness-tests/305-utf8.t @@ -30,7 +30,7 @@ L --]] -require 'tap' +require 'test_assertion' local profile = require'profile' local has_utf8 = _VERSION >= '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 c57947f6..5d74c499 100755 --- a/test/lua-Harness-tests/306-table.t +++ b/test/lua-Harness-tests/306-table.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') local has_foreach = _VERSION == 'Lua 5.1' diff --git a/test/lua-Harness-tests/307-math.t b/test/lua-Harness-tests/307-math.t index b50e449f..08b1e5ec 100755 --- a/test/lua-Harness-tests/307-math.t +++ b/test/lua-Harness-tests/307-math.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local has_integer = _VERSION >= 'Lua 5.3' or (jit and jit.version:match'moonjit') or profile.integer local has_mathx = _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 c126adf2..5ea3afc7 100755 --- a/test/lua-Harness-tests/308-io.t +++ b/test/lua-Harness-tests/308-io.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') local has_write51 = _VERSION == '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 ff033bbf..2002ca47 100755 --- a/test/lua-Harness-tests/309-os.t +++ b/test/lua-Harness-tests/309-os.t @@ -30,7 +30,7 @@ L --]] -require'tap' +require'test_assertion' local profile = require'profile' local luajit20 = jit and (jit.version_num < 20100 and not jit.version:match'^RaptorJIT') local has_execute51 = _VERSION == '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 4ec970fb..f8338d1f 100755 --- a/test/lua-Harness-tests/310-debug.t +++ b/test/lua-Harness-tests/310-debug.t @@ -30,7 +30,7 @@ L ]] -require 'tap' +require 'test_assertion' local profile = require'profile' local has_getfenv = _VERSION == 'Lua 5.1' local has_gethook54 = _VERSION >= 'Lua 5.4' diff --git a/test/lua-Harness-tests/311-bit32.t b/test/lua-Harness-tests/311-bit32.t index b8ccb7ea..e6d5ca8d 100755 --- a/test/lua-Harness-tests/311-bit32.t +++ b/test/lua-Harness-tests/311-bit32.t @@ -29,7 +29,7 @@ L --]] -require 'tap' +require 'test_assertion' local profile = require'profile' local has_bit32 = _VERSION == 'Lua 5.2' or profile.compat52 or profile.has_bit32 diff --git a/test/lua-Harness-tests/314-regex.t b/test/lua-Harness-tests/314-regex.t index 56883bd4..62e2ad7f 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. --]] -require'tap' +require'test_assertion' local loadstring = loadstring or load plan(162) diff --git a/test/lua-Harness-tests/320-stdin.t b/test/lua-Harness-tests/320-stdin.t index 09f92c1b..b65b8f37 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 --]] -require'tap' +require'test_assertion' local lua = get_lua_binary_name() diff --git a/test/lua-Harness-tests/401-bitop.t b/test/lua-Harness-tests/401-bitop.t index e454420e..84259cd3 100755 --- a/test/lua-Harness-tests/401-bitop.t +++ b/test/lua-Harness-tests/401-bitop.t @@ -24,7 +24,7 @@ See L. --]] -require 'tap' +require 'test_assertion' 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 73507a61..48ae8c20 100755 --- a/test/lua-Harness-tests/402-ffi.t +++ b/test/lua-Harness-tests/402-ffi.t @@ -24,7 +24,7 @@ See L. --]] -require 'tap' +require 'test_assertion' 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 306a7c44..1724dfd1 100755 --- a/test/lua-Harness-tests/403-jit.t +++ b/test/lua-Harness-tests/403-jit.t @@ -24,7 +24,7 @@ See L. --]] -require 'tap' +require 'test_assertion' local profile = require'profile' if not jit then diff --git a/test/lua-Harness-tests/404-ext.t b/test/lua-Harness-tests/404-ext.t index afe1d5b5..7239e5df 100755 --- a/test/lua-Harness-tests/404-ext.t +++ b/test/lua-Harness-tests/404-ext.t @@ -24,7 +24,7 @@ See L. --]] -require 'tap' +require 'test_assertion' local profile = require'profile' local luajit21 = jit and (jit.version_num >= 20100 or jit.version:match'^RaptorJIT') diff --git a/test/lua-Harness-tests/411-luajit.t.disabled b/test/lua-Harness-tests/411-luajit.t.disabled index ad7e279e..39cca5b0 100755 --- a/test/lua-Harness-tests/411-luajit.t.disabled +++ b/test/lua-Harness-tests/411-luajit.t.disabled @@ -24,7 +24,7 @@ See L --]] -require'tap' +require'test_assertion' local profile = require'profile' if not jit or ujit then diff --git a/test/lua-Harness-tests/tap.lua b/test/lua-Harness-tests/test_assertion.lua similarity index 100% rename from test/lua-Harness-tests/tap.lua rename to test/lua-Harness-tests/test_assertion.lua -- 2.32.0