aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-01-15 11:33:32 -0800
committerJussi Pakkanen <jpakkane@gmail.com>2020-01-22 23:39:33 +0200
commit255fa5a320369f6a7b52f2963574a09e7e693d9a (patch)
treeb482d468606c0675975a0594db98015d9730402c /run_unittests.py
parent730a7b296fdff8aca58e15829485b3b68262d3c0 (diff)
downloadmeson-255fa5a320369f6a7b52f2963574a09e7e693d9a.zip
meson-255fa5a320369f6a7b52f2963574a09e7e693d9a.tar.gz
meson-255fa5a320369f6a7b52f2963574a09e7e693d9a.tar.bz2
tests: Add a test case for finding ld
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index d8c3a1c..79b7018 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -4664,7 +4664,7 @@ class WindowsTests(BasePlatformTests):
def _check_ld(self, name: str, lang: str, expected: str) -> None:
if not shutil.which(name):
raise unittest.SkipTest('Could not find {}.'.format(name))
- envvar = mesonbuild.envconfig.BinaryTable.evarMap['{}ld'.format(lang)]
+ envvar = mesonbuild.envconfig.BinaryTable.evarMap['{}_ld'.format(lang)]
with mock.patch.dict(os.environ, {envvar: name}):
env = get_fake_env()
try:
@@ -5945,7 +5945,7 @@ c = ['{0}']
raise unittest.SkipTest('Solaris currently cannot override the linker.')
if not shutil.which(check):
raise unittest.SkipTest('Could not find {}.'.format(check))
- envvar = mesonbuild.envconfig.BinaryTable.evarMap['{}ld'.format(lang)]
+ envvar = mesonbuild.envconfig.BinaryTable.evarMap['{}_ld'.format(lang)]
with mock.patch.dict(os.environ, {envvar: name}):
env = get_fake_env()
comp = getattr(env, 'detect_{}_compiler'.format(lang))(MachineChoice.HOST)