Add tests for manylinux2014

pypa · Sep 28, 2019 · 82f295a · 82f295a
1 parent 61edd31
commit 82f295a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/tests/integration/pip-19.3.dev0-py2.py3-none-any.whl b/tests/integration/pip-19.3.dev0-py2.py3-none-any.whl
diff --git a/tests/integration/test_manylinux.py b/tests/integration/test_manylinux.py
@@ -18,15 +18,18 @@
 ENCODING = 'utf-8'
 MANYLINUX1_IMAGE_ID = 'quay.io/pypa/manylinux1_x86_64'
 MANYLINUX2010_IMAGE_ID = 'quay.io/pypa/manylinux2010_x86_64'
+MANYLINUX2014_IMAGE_ID = 'docker.io/mayeut/manylinux2014_x86_64:latest'
 MANYLINUX_IMAGES = {
     'manylinux1': MANYLINUX1_IMAGE_ID,
     'manylinux2010': MANYLINUX2010_IMAGE_ID,
+    'manylinux2014': MANYLINUX2014_IMAGE_ID,
 }
 DOCKER_CONTAINER_NAME = 'auditwheel-test-manylinux'
 PYTHON_IMAGE_ID = 'python:3.5'
 DEVTOOLSET = {
     'manylinux1': 'devtoolset-2',
     'manylinux2010': 'devtoolset-8',
+    'manylinux2014': 'devtoolset-8',
 }
 PATH_DIRS = [
     '/opt/python/cp35-cp35m/bin',
@@ -133,7 +136,7 @@ def tmp_docker_image(base, commands, setup_env={}):
 @pytest.fixture(scope='session')
 def docker_python_img():
     """The Python base image with up-to-date pip"""
-    with tmp_docker_image(PYTHON_IMAGE_ID, ['pip install -U pip']) as img_id:
+    with tmp_docker_image(PYTHON_IMAGE_ID, ['pip install -U /auditwheel_src/tests/integration/pip-19.3.dev0-py2.py3-none-any.whl']) as img_id:
         yield img_id
 
 @pytest.fixture(scope='session', params=MANYLINUX_IMAGES.keys())

diff --git a/tests/integration/testdependencies/dependency.c b/tests/integration/testdependencies/dependency.c
@@ -3,7 +3,9 @@
 
 int dep_run()
 {
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
+#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17)
+    return (int)secure_getenv("NON_EXISTING_ENV_VARIABLE");
+#elif defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
     return malloc_info(0, stdout);
 #else
     return 0;

diff --git a/tests/integration/testdependencies/testdependencies.c b/tests/integration/testdependencies/testdependencies.c
@@ -15,6 +15,8 @@ run(PyObject *self, PyObject *args)
 
 #ifdef WITH_DEPENDENCY
     res = dep_run();
+#elif defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17)
+    res = (int)secure_getenv("NON_EXISTING_ENV_VARIABLE");
 #elif defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
     res = malloc_info(0, stdout);
 #else