From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <tarantool-patches-bounces@dev.tarantool.org>
Received: from [87.239.111.99] (localhost [127.0.0.1])
by dev.tarantool.org (Postfix) with ESMTP id BD81D6EC56;
Tue, 20 Jul 2021 19:31:05 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BD81D6EC56
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev;
t=1626798665; bh=sqSkhL76JhUSba9XeXG+aOrMli+PsgYd76WnaMfzj+g=;
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=J5q+oCyu3Y7ZtsN0zHmRcE+dvGsKs6G1PYgpaVHkb4GLCd+33+Ys4IDVERgn4NrrW
x2YURR8nENavpbu2UNeNbouQHP+E5LXZzWGQ951gTbEq4ZANlEvD1LKxq/IHpBo/QE
8pZLGyhvZpzBne1/xu0YP4ZWbgq2Maey0hUgS5wI=
Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com
[209.85.208.174])
(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 ECDFE6EC70
for <tarantool-patches@dev.tarantool.org>;
Tue, 20 Jul 2021 19:27:59 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ECDFE6EC70
Received: by mail-lj1-f174.google.com with SMTP id d17so11706789ljq.12
for <tarantool-patches@dev.tarantool.org>;
Tue, 20 Jul 2021 09:27:59 -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=hJKfKJL40tTvm8D2QQfx7gZD884CF+vr3LCXMI8htPA=;
b=TOFLB80E5CI98L/DYL/I3woPdkWyTgdZHcHY3NOtyuiNvUQljqiJnqR4w4D7tXPDih
L1idlPVszX37t9wIGc86WiXhUjro7mgWcl4bid3f/4CO6KzA53+tXBjerJvrJRl+zLJX
7ZYhiYn6jHjCcIT3d6x4EWHLciANZAsMPKGIgkgolJTcLOAcHwkc6wNDqRZwrGnRhAbs
YBfsvfoN3HRaL8iUcL4YVBeEvmRJJEK8DkOCUjx6Q4KtWvbW0fmh93xVcXrpsuXt0heW
trF1cMRXVhxA/BkNx7o0Eq/F3BriSEG2/ghkknEDD+paU0LbJJDEvwGDoBY9DNK1u+c3
lgcQ==
X-Gm-Message-State: AOAM530GY78d+r1AM2rpVRc2e7SCL3v/Bm0mrR97RKwSdJJV2eWKGm1B
ErM2yO0JnTHfHsqy/w6Ui++XMxVVFJDCZJUR
X-Google-Smtp-Source: ABdhPJwcNugNyHkE2xkB0cCkx9GjhXOEO8J6Wkvv0s7rs2dgjL3N4tGZ5SmHPL0lGHgZTVyc7plxBQ==
X-Received: by 2002:a2e:9e1a:: with SMTP id e26mr27338515ljk.265.1626798479267;
Tue, 20 Jul 2021 09:27:59 -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.58
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 20 Jul 2021 09:27:58 -0700 (PDT)
X-Google-Original-From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
To: tarantool-patches@dev.tarantool.org, imun@tarantool.org,
skaplun@tarantool.org
Date: Tue, 20 Jul 2021 19:26:55 +0300
Message-Id: <d36decc3bd7db70f3137353302cee4951b192cc4.1626797225.git.m.kokryashkin@tarantool.org>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <cover.1626797225.git.m.kokryashkin@tarantool.org>
References: <cover.1626797225.git.m.kokryashkin@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v2 07/10] test: backport lua-Harness
directory detection
X-BeenThere: tarantool-patches@dev.tarantool.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
From: Maxim Kokryashkin via Tarantool-patches
<tarantool-patches@dev.tarantool.org>
Reply-To: Maxim Kokryashkin <max.kokryashkin@gmail.com>
Errors-To: tarantool-patches-bounces@dev.tarantool.org
Sender: "Tarantool-patches" <tarantool-patches-bounces@dev.tarantool.org>
The patch[1] from lua-Harness fixes the same issue commit
789820aac7cecc3b5ae394aadc12a5ec25b68121('test: fix directory detection
in lua-Harness suite') does, but it also works on Windows, so the
mentioned commit can be supreseded by that patch.
Part of tarantool/tarantool#5970
Part of tarantool/tarantool#4473
---
test/lua-Harness-tests/314-regex.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/lua-Harness-tests/314-regex.t b/test/lua-Harness-tests/314-regex.t
index 62e2ad7f..71037779 100755
--- a/test/lua-Harness-tests/314-regex.t
+++ b/test/lua-Harness-tests/314-regex.t
@@ -164,7 +164,7 @@ local function split (line)
end
local test_number = 0
-local dirname = arg[0]:gsub('([^/]+)%.t$', '')
+local dirname = arg[0]:gsub('([^/\\]+)$', '')
for _, filename in ipairs(test_files) do
local f, msg = io.open(dirname .. filename, 'r')
if f == nil then
--
2.32.0