39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
From 0e03f2192cd80e6a4a1bf83f0238cc6d133b8475 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Thu, 7 Nov 2019 11:32:26 +0100
|
||
|
|
Subject: [PATCH] meson: avoid bogus meson warning
|
||
|
|
|
||
|
|
With meson-0.52.0-1.module_f31+6771+f5d842eb.noarch I get:
|
||
|
|
src/test/meson.build:19: WARNING: Overriding previous value of environment variable 'PATH' with a new one
|
||
|
|
|
||
|
|
When we're using *prepend*, the whole point is to modify an existing variable,
|
||
|
|
so meson shouldn't warn. But let's set avoid the warning and shorten things by
|
||
|
|
setting the final value immediately.
|
||
|
|
|
||
|
|
(cherry picked from commit cbe804947482998cc767bfb0c169e6263a6ef097)
|
||
|
|
|
||
|
|
Related: #2030027
|
||
|
|
---
|
||
|
|
src/test/meson.build | 5 ++---
|
||
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/test/meson.build b/src/test/meson.build
|
||
|
|
index 7b310d4ec7..4bbc67d367 100644
|
||
|
|
--- a/src/test/meson.build
|
||
|
|
+++ b/src/test/meson.build
|
||
|
|
@@ -10,12 +10,11 @@ test_hashmap_ordered_c = custom_target(
|
||
|
|
|
||
|
|
test_include_dir = include_directories('.')
|
||
|
|
|
||
|
|
-path = run_command('sh', ['-c', 'echo "$PATH"']).stdout()
|
||
|
|
+path = run_command('sh', ['-c', 'echo "$PATH"']).stdout().strip()
|
||
|
|
test_env = environment()
|
||
|
|
test_env.set('SYSTEMD_KBD_MODEL_MAP', kbd_model_map)
|
||
|
|
test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
|
||
|
|
-test_env.set('PATH', path)
|
||
|
|
-test_env.prepend('PATH', meson.build_root())
|
||
|
|
+test_env.set('PATH', '@0@:@1@'.format(meson.build_root(), path))
|
||
|
|
|
||
|
|
############################################################
|
||
|
|
|