aboutsummaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorVolker Weißmann <volker.weissmann@gmx.de>2023-04-15 20:58:56 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2023-05-13 11:06:24 +0300
commit2699fd4b8a7330bb67f79c3254777167cae19b48 (patch)
treee6b52420c89f11294f9f0a405b605915ccd03987 /unittests
parent8d816111142694d032f68a549f4a9e18f38427e2 (diff)
downloadmeson-2699fd4b8a7330bb67f79c3254777167cae19b48.zip
meson-2699fd4b8a7330bb67f79c3254777167cae19b48.tar.gz
meson-2699fd4b8a7330bb67f79c3254777167cae19b48.tar.bz2
During reconfigure, show that no compiler was found, if compiler fails sanity check.
Diffstat (limited to 'unittests')
-rw-r--r--unittests/allplatformstests.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 46883dd..1fcb1f3 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -841,7 +841,7 @@ class AllPlatformTests(BasePlatformTests):
testdir = os.path.join("test cases/cython", '2 generated sources')
env = get_fake_env(testdir, self.builddir, self.prefix)
try:
- detect_compiler_for(env, "cython", MachineChoice.HOST)
+ detect_compiler_for(env, "cython", MachineChoice.HOST, True)
except EnvironmentException:
raise SkipTest("Cython is not installed")
self.init(testdir)
@@ -866,7 +866,7 @@ class AllPlatformTests(BasePlatformTests):
testdir = os.path.join("test cases/cython", '2 generated sources')
env = get_fake_env(testdir, self.builddir, self.prefix)
try:
- cython = detect_compiler_for(env, "cython", MachineChoice.HOST)
+ cython = detect_compiler_for(env, "cython", MachineChoice.HOST, True)
if not version_compare(cython.version, '>=0.29.33'):
raise SkipTest('Cython is too old')
except EnvironmentException:
@@ -2141,7 +2141,7 @@ class AllPlatformTests(BasePlatformTests):
env = get_fake_env()
for l in ['cpp', 'cs', 'd', 'java', 'cuda', 'fortran', 'objc', 'objcpp', 'rust']:
try:
- comp = detect_compiler_for(env, l, MachineChoice.HOST)
+ comp = detect_compiler_for(env, l, MachineChoice.HOST, True)
with tempfile.TemporaryDirectory() as d:
comp.sanity_check(d, env)
langs.append(l)
@@ -2158,7 +2158,7 @@ class AllPlatformTests(BasePlatformTests):
if is_windows() and lang == 'fortran' and target_type == 'library':
# non-Gfortran Windows Fortran compilers do not do shared libraries in a Fortran standard way
# see "test cases/fortran/6 dynamic"
- fc = detect_compiler_for(env, 'fortran', MachineChoice.HOST)
+ fc = detect_compiler_for(env, 'fortran', MachineChoice.HOST, True)
if fc.get_id() in {'intel-cl', 'pgi'}:
continue
# test empty directory
@@ -4177,18 +4177,18 @@ class AllPlatformTests(BasePlatformTests):
env = get_fake_env()
# Get the compiler so we know which compiler class to mock.
- cc = detect_compiler_for(env, 'c', MachineChoice.HOST)
+ cc = detect_compiler_for(env, 'c', MachineChoice.HOST, True)
cc_type = type(cc)
# Test a compiler that acts as a linker
with mock.patch.object(cc_type, 'INVOKES_LINKER', True):
- cc = detect_compiler_for(env, 'c', MachineChoice.HOST)
+ cc = detect_compiler_for(env, 'c', MachineChoice.HOST, True)
link_args = env.coredata.get_external_link_args(cc.for_machine, cc.language)
self.assertEqual(sorted(link_args), sorted(['-DCFLAG', '-flto']))
# And one that doesn't
with mock.patch.object(cc_type, 'INVOKES_LINKER', False):
- cc = detect_compiler_for(env, 'c', MachineChoice.HOST)
+ cc = detect_compiler_for(env, 'c', MachineChoice.HOST, True)
link_args = env.coredata.get_external_link_args(cc.for_machine, cc.language)
self.assertEqual(sorted(link_args), sorted(['-flto']))