{"thread":{"id":"63122","subject":"[PATCH v2] meson: use test_environment conditionally.","startedAt":"2025-03-14T18:06:15Z","lastAt":"2025-03-14T18:06:15Z","messageCount":1,"participants":["Sam James"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"514289","messageId":"3d127f293818f935efdb9ca7bb556e6a8f233ef7.1741975557.git.sam@gentoo.org","threadId":"63122","inReplyTo":null,"subject":"[PATCH v2] meson: use test_environment conditionally.","fromName":"Sam James","fromEmail":"sam@gentoo.org","sentAt":"2025-03-14T18:05:57Z","receivedAt":"2025-03-14T18:06:15Z","isPatch":true,"sender":{"key":"sam@gentoo.org","avatar":"https://avatars.githubusercontent.com/u/11667869?v=4"},"body":"test_environment is only defined with -Dtests, so use it conditionally\nand define a stub environment() instead, to avoid erroring out:\n\n```\n$ meson setup -Dtests=false -Dcontrib=subtree build\n[...]\n\ncontrib/subtree/meson.build:15:27: ERROR: Unknown variable \"test_environment\".\n```\n\nDo the same for 'netrc' in contrib/ as it uses the same pattern.\n---\nv2: Use syntax that actually works in netrc.\n\n contrib/credential/netrc/meson.build | 8 ++++++--\n contrib/subtree/meson.build          | 8 ++++++--\n 2 files changed, 12 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/credential/netrc/meson.build b/contrib/credential/netrc/meson.build\nindex a990dbb86d..337c82c992 100644\n--- a/contrib/credential/netrc/meson.build\n+++ b/contrib/credential/netrc/meson.build\n@@ -7,8 +7,12 @@ credential_netrc = custom_target(\n   install_dir: get_option('libexecdir') / 'git-core',\n )\n \n-credential_netrc_testenv = test_environment\n-credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path())\n+if get_option('tests')\n+  credential_netrc_testenv = test_environment\n+  credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path())\n+else\n+  credential_netrc_testenv = environment()\n+endif\n \n test('t-git-credential-netrc',\n   shell,\ndiff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build\nindex 9c72b23625..d18f188216 100644\n--- a/contrib/subtree/meson.build\n+++ b/contrib/subtree/meson.build\n@@ -12,8 +12,12 @@ git_subtree = custom_target(\n   install_dir: get_option('libexecdir') / 'git-core',\n )\n \n-subtree_test_environment = test_environment\n-subtree_test_environment.prepend('PATH', meson.current_build_dir())\n+if get_option('tests')\n+  subtree_test_environment = test_environment\n+  subtree_test_environment.prepend('PATH', meson.current_build_dir())\n+else\n+  subtree_test_environment = environment()\n+endif\n \n test('t7900-subtree', shell,\n   args: [ 't7900-subtree.sh' ],\n-- \n2.48.1\n\n"}]}