Skip to content

Commit

Permalink
nix: skip ssllyze on aarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
dougch committed Jun 16, 2023
1 parent 669142d commit 3ba8bf7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,13 @@ if (BUILD_TESTING)
# For Nix and environments where LD_LIBRARY_PATH is already correct.
# We're also dropping tox and calling pytest directly, because
# Nix is already handling all of the python setup.
if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ${test_target} STREQUAL "integrationv2_sslyze" )
# Skip sslyze/nassl on non-x86; it has not been built for arm
# and pytest.importskip() is still failing the test.
message(WARNING "Not adding integ test ${test_target} on ${CMAKE_SYSTEM_PROCESSOR}")
continue()
endif()
message(STATUS "Adding integ test ${test_target}")
add_test(NAME ${test_target}
COMMAND
pytest
Expand Down
27 changes: 15 additions & 12 deletions nix/pyenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@ let
pydantic # >=1.7,<1.9 TODO: check if this version is correct/if it matters
];
};
in pkgs.python310.withPackages (ps: [
ps.pep8
ps.pytest # ==5.3.5 TODO: check if this version is correct/if it matters
ps.pytest-xdist # ==1.34.0 TODO: check if this version is correct/if it matters
sslyze # ==5.0.2 TODO: check if this version is correct/if it matters
ps.pytest-rerunfailures
ps.tox
ps.typing-extensions
ps.setuptools-rust
ps.cryptography
nassl
])
in pkgs.python310.withPackages (ps:
[
ps.pep8
ps.pytest
ps.pytest-xdist
ps.pytest-rerunfailures
ps.typing-extensions
ps.setuptools-rust
ps.cryptography
] ++ (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then [
nassl
sslyze
] else
[ ]))

0 comments on commit 3ba8bf7

Please sign in to comment.