From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2 luajit 3/7] cmake: introduce AppendTestEnvVar macro
Date: Tue, 24 Sep 2024 13:29:48 +0300 [thread overview]
Message-ID: <e4ec7aa1f1650237d492dc94a5f384ff59f8b4cc.1727172936.git.skaplun@tarantool.org> (raw)
In-Reply-To: <cover.1727172936.git.skaplun@tarantool.org>
It is useful to update the environment variable for some tests. For
CMake versions >= 3.22, we can use ENVIRONMENT_MODIFICATION [1] instead.
But unless we bump the CMake version, this macro is a workaround.
[1]: https://cmake.org/cmake/help/latest/prop_test/ENVIRONMENT_MODIFICATION.html
Part of tarantool/tarantool#9898
---
test/tarantool-tests/CMakeLists.txt | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 11a84496..ff402dc0 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt
@@ -18,6 +18,34 @@ macro(BuildTestCLib lib sources)
set(LD_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}:${LD_LIBRARY_PATH}" PARENT_SCOPE)
endmacro()
+# FIXME: This is used only due to ancient CMake requirements.
+# If we update to CMake >= 3.22, we can use
+# ENVIRONMENT_MODIFICATION [1] instead.
+# [1]: https://cmake.org/cmake/help/latest/prop_test/ENVIRONMENT_MODIFICATION.html
+# This macro appends to the given test's environment variable the
+# given value. If the variable doesn't exist, it is created equal
+# to the given argument.
+macro(AppendTestEnvVar testname var value)
+ get_test_property(${testname} ENVIRONMENT old_env)
+ foreach(loopvar ${old_env})
+ # XXX: `foreach()` unescapes ";" in string, escape them back.
+ string(REPLACE ";" "\;" loopvar "${loopvar}")
+ if("${loopvar}" MATCHES "^${var}=(.*)")
+ set(envvar_found TRUE)
+ set(loopvar "${var}=${value}${CMAKE_MATCH_1}")
+ endif()
+ list(APPEND new_env "${loopvar}")
+ endforeach()
+ if(NOT "${envvar_found}")
+ list(APPEND new_env "${var}=${value}")
+ endif()
+ set_tests_properties(${testname} PROPERTIES ENVIRONMENT "${new_env}")
+
+ unset(envvar_found)
+ unset(old_env)
+ unset(new_env)
+endmacro()
+
add_subdirectory(ffi-ccall)
add_subdirectory(fix-bit-shift-generation)
add_subdirectory(gh-4427-ffi-sandwich)
--
2.46.0
next prev parent reply other threads:[~2024-09-24 10:31 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-24 10:29 [Tarantool-patches] [PATCH v2 luajit 0/7] Shrink test env and fix flaky tests Sergey Kaplun via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 1/7] test: move profilers tests to subdirectory Sergey Kaplun via Tarantool-patches
2024-09-24 11:07 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:28 ` Maxim Kokryashkin via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 2/7] test: rename <arm64-ccall-fp-convention.test.lua> Sergey Kaplun via Tarantool-patches
2024-09-24 11:07 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:29 ` Maxim Kokryashkin via Tarantool-patches
2024-09-24 10:29 ` Sergey Kaplun via Tarantool-patches [this message]
2024-09-24 11:07 ` [Tarantool-patches] [PATCH v2 luajit 3/7] cmake: introduce AppendTestEnvVar macro Sergey Bronnikov via Tarantool-patches
2024-10-11 18:30 ` Maxim Kokryashkin via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 4/7] test: shrink LUA_PATH environment variable Sergey Kaplun via Tarantool-patches
2024-09-24 11:15 ` Sergey Bronnikov via Tarantool-patches
2024-09-24 11:33 ` Sergey Kaplun via Tarantool-patches
[not found] ` <ZvO5g6ryIcyhM1vg@root>
2024-09-25 7:22 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:31 ` Maxim Kokryashkin via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 5/7] test: shrink LUA_CPATH and {DY}LD_LIBRARY_PATH Sergey Kaplun via Tarantool-patches
2024-09-24 11:16 ` Sergey Bronnikov via Tarantool-patches
2024-09-24 11:28 ` Sergey Kaplun via Tarantool-patches
2024-09-24 14:18 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:37 ` Maxim Kokryashkin via Tarantool-patches
2024-10-12 7:00 ` Sergey Kaplun via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 6/7] test: skip flaky tests with enabled table bump Sergey Kaplun via Tarantool-patches
2024-09-24 11:26 ` Sergey Bronnikov via Tarantool-patches
2024-09-24 11:45 ` Sergey Kaplun via Tarantool-patches
2024-09-24 14:17 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:38 ` Maxim Kokryashkin via Tarantool-patches
2024-09-24 10:29 ` [Tarantool-patches] [PATCH v2 luajit 7/7] test: set LD_PRELOAD only when necessary Sergey Kaplun via Tarantool-patches
2024-09-24 14:13 ` Sergey Bronnikov via Tarantool-patches
2024-09-24 15:23 ` Sergey Kaplun via Tarantool-patches
2024-09-24 17:41 ` Sergey Bronnikov via Tarantool-patches
2024-10-11 18:46 ` Maxim Kokryashkin via Tarantool-patches
2024-10-18 15:18 ` [Tarantool-patches] [PATCH v2 luajit 0/7] Shrink test env and fix flaky tests Sergey Kaplun via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e4ec7aa1f1650237d492dc94a5f384ff59f8b4cc.1727172936.git.skaplun@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=m.kokryashkin@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 luajit 3/7] cmake: introduce AppendTestEnvVar macro' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox