Skip to content

Commit 92210c4

Browse files
authored
Merge pull request #1154 from esc/set_LLVMLITE_DIST_TEST_in_azure
execute dist tests for linux-64 conda pkgs via Azure
2 parents 149af85 + 5b5e451 commit 92210c4

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

azure-pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,25 @@ jobs:
3939
PYTHON: '3.10'
4040
CONDA_ENV: cienv
4141
RUN_FLAKE8: yes
42+
DIST_TEST: yes
4243
py311:
4344
PYTHON: '3.11'
4445
CONDA_ENV: cienv
4546
RUN_FLAKE8: yes
4647
RUN_CLANG_FORMAT: yes
48+
DIST_TEST: yes
4749
py312:
4850
PYTHON: '3.12'
4951
CONDA_ENV: cienv
5052
RUN_FLAKE8: yes
5153
RUN_CLANG_FORMAT: yes
54+
DIST_TEST: yes
5255
py313:
5356
PYTHON: '3.13'
5457
CONDA_ENV: cienv
5558
RUN_FLAKE8: yes
5659
RUN_CLANG_FORMAT: yes
60+
DIST_TEST: yes
5761
# temporarily disabled
5862
# pypy:
5963
# PYTHON: pypy

buildscripts/incremental/test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ fi
1919
if [ "$WHEEL" == "yes" ]; then
2020
cd dist
2121
python -m llvmlite.tests -v
22+
elif [ "$DIST_TEST" == "yes" ]; then
23+
LLVMLITE_DIST_TEST=1 python runtests.py -v
2224
else
2325
python runtests.py -v
2426
fi

llvmlite/tests/test_binding.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,13 +718,21 @@ def test_linux(self):
718718
self.fail("failed parsing dependencies? got %r" % (deps,))
719719
# Ensure all dependencies are expected
720720
allowed = set(['librt', 'libdl', 'libpthread', 'libz', 'libm',
721-
'libgcc_s', 'libc', 'ld-linux', 'ld64'])
721+
'libgcc_s', 'libc', 'ld-linux', 'ld64', 'libzstd',
722+
'libstdc++'])
722723
if platform.python_implementation() == 'PyPy':
723724
allowed.add('libtinfo')
724725

726+
fails = []
725727
for dep in deps:
726728
if not dep.startswith('ld-linux-') and dep not in allowed:
727-
self.fail("unexpected dependency %r in %r" % (dep, deps))
729+
fails.append(dep)
730+
if len(fails) == 1:
731+
self.fail("unexpected dependency %r in %r" % (fails[0], deps))
732+
elif len(fails) > 1:
733+
self.fail("unexpected dependencies %r in %r" % (fails, deps))
734+
else:
735+
pass # test passes
728736

729737

730738
class TestRISCVABI(BaseTest):

0 commit comments

Comments
 (0)