diff --git a/tests/integration/nonpy_rpath/extensions/testcrypt.cpp b/tests/integration/nonpy_rpath/extensions/testcrypt.cpp index 5a3c1e39..0818de54 100644 --- a/tests/integration/nonpy_rpath/extensions/testcrypt.cpp +++ b/tests/integration/nonpy_rpath/extensions/testcrypt.cpp @@ -2,5 +2,9 @@ #include std::string crypt_something() { - return std::string(crypt("will error out", NULL)); + char const* result = crypt("will error out", "\0"); + if (result == NULL) { + return std::string("*"); + } + return std::string(result); } diff --git a/tests/integration/test_manylinux.py b/tests/integration/test_manylinux.py index db3bc35d..d54d75d0 100644 --- a/tests/integration/test_manylinux.py +++ b/tests/integration/test_manylinux.py @@ -595,7 +595,7 @@ def test_nonpy_rpath(self, any_manylinux_container, docker_python, io_folder): f'auditwheel repair --plat {policy} --only-plat -w /io /io/{orig_wheel}' docker_exec( manylinux_ctr, - ["bash", "-c", "LD_LIBRARY_PATH=/usr/local/lib " + repair_command] + ["bash", "-c", repair_command] ) filenames = os.listdir(io_folder) assert len(filenames) == 2 @@ -605,8 +605,6 @@ def test_nonpy_rpath(self, any_manylinux_container, docker_python, io_folder): # Test the resulting wheel outside the manylinux container docker_exec(docker_python, "pip install /io/" + repaired_wheel) - if 'musllinux' in tag: - pytest.xfail("libcrypt segfaults") docker_exec( docker_python, ["python", "-c",