Skip to content

Commit

Permalink
PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
dougch committed Jun 14, 2023
1 parent 1f17e81 commit 0213e77
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ if (BUILD_TESTING)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND ${test_target} STREQUAL "integrationv2_sslyze" )
# Skip sslyze/nassl on aarch64, it's not available,
# and pytest.importskip() is still failing the test.
message(WARNING "Not adding integ test ${test_target} on ${CMAKE_SYSTEM_PROCESSOR}")
message(WARNING "Skipping ${test_target} on ${CMAKE_SYSTEM_PROCESSOR} as the sslyze tooling is not available.")
continue()
endif()
message(STATUS "Adding integ test ${test_target}")
Expand Down
4 changes: 1 addition & 3 deletions nix/shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ function integ {
echo "- renegotiate_apache"
echo " This test requires apache to be running. See codebuild/bin/s2n_apache.sh"
echo " for more info."
echo "- sslyze (on aarch64)"
echo " Test tooling isn't available for arm"
return
fi
if [[ -z "$1" ]]; then
banner "Running all integ tests except cross_compatibility, renegotiate_apache, and sslyze on arm."
(cd $SRC_ROOT/build; ctest -L integrationv2 -E "(integrationv2_cross_compatibility|integrationv2_renegotiate_apache)" --verbose)
else
banner "Warning: cross_compatibility, renegotiate_apache, and nix on arm are not supported in nix for various reasons integ help for more info."
banner "Warning: cross_compatibility & renegotiate_apache are not supported in nix for various reasons integ help for more info."
for test in $@; do
# ctest will error if it can't find this test on arm.
if [ "$test" == "sslyze" ] && [ "$(uname -m)" == "aarch64" ]; then
Expand Down

0 comments on commit 0213e77

Please sign in to comment.