diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-05-05 11:38:41 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-05-06 07:49:32 -0400 |
| commit | 42327eacbc39674bc5b624fa1b8b3782c7a73b37 (patch) | |
| tree | 603bbaa25dcf5c0c38d0ad31eb1ef751e67307d1 | |
| parent | 09a26032852a4b4fbab9dcfa819c6958e426b9b1 (diff) | |
| download | meson-42327eacbc39674bc5b624fa1b8b3782c7a73b37.zip meson-42327eacbc39674bc5b624fa1b8b3782c7a73b37.tar.gz meson-42327eacbc39674bc5b624fa1b8b3782c7a73b37.tar.bz2 | |
unittests: Skip prelinking test with gcc 8 or older
This was already skipped when running on the Ubuntu 18.04 version of gcc,
but it also fails with gcc 8.3.0 on Debian 10. Instead of hard-coding
specific versions to look for, do a version comparison.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | unittests/linuxliketests.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index ed6c959..f120590 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1726,10 +1726,8 @@ class LinuxlikeTests(BasePlatformTests): testdir = os.path.join(self.unit_test_dir, '86 prelinking') env = get_fake_env(testdir, self.builddir, self.prefix) cc = detect_c_compiler(env, MachineChoice.HOST) - if cc.id == "gcc": - gccver = subprocess.check_output(['gcc', '--version']) - if b'7.5.0' in gccver: - raise SkipTest('GCC on Bionic is too old to be supported.') + if cc.id == "gcc" and not version_compare(cc.version, '>=9'): + raise SkipTest('Prelinking not supported with gcc 8 or older.') self.init(testdir) self.build() outlib = os.path.join(self.builddir, 'libprelinked.a') |