From f28d9e2472f50095d9a630e7c64e44c6520888d4 Mon Sep 17 00:00:00 2001 From: Oleg Chaplashkin <ochaplashkin@tarantool.org> Date: Tue, 30 May 2023 16:38:14 +0400 Subject: [PATCH] metrics: bump to new version Bump the metrics submodule to 1.0.0-2-gea83227 version. NO_DOC=metrics submodule bump NO_TEST=metrics submodule bump NO_CHANGELOG=metrics submodule bump (cherry picked from commit 2780e8e02522893b11898605748062fad86b5dab) --- test/metrics-luatest/helper.lua | 10 +++++++++- third_party/metrics | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/metrics-luatest/helper.lua b/test/metrics-luatest/helper.lua index 84bd15ee12..6dc9b7ed57 100644 --- a/test/metrics-luatest/helper.lua +++ b/test/metrics-luatest/helper.lua @@ -109,4 +109,12 @@ local function workaround_requires(path) end workaround_requires('test.utils') -workaround_requires('test.psutils_linux_test_payload') + +require('test.utils') +local test_root = fio.dirname( + fio.dirname(fio.abspath( + package.search('third_party.metrics.test.utils')))) -- luacheck: ignore + +package.loaded['test.utils'].LUA_PATH = os.getenv('LUA_PATH') .. + test_root .. '/?.lua;' .. + test_root .. '/?/init.lua;' diff --git a/third_party/metrics b/third_party/metrics index 080fb5bda3..ea832276b6 160000 --- a/third_party/metrics +++ b/third_party/metrics @@ -1 +1 @@ -Subproject commit 080fb5bda32a5df44fc30604cfacbb3623aff90e +Subproject commit ea832276b61df2c7f9f0bbcf7a47e04635e88705 -- GitLab