PR feedback; handle the case where sslyze test was explicitly requested

CMakeLists.txt

@@ -589,8 +589,8 @@ 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
+                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}")
                   continue()

nix/shell.sh

@@ -59,8 +59,13 @@ function integ {
         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 are not supported in nix for various reasons integ help for more info."
+        banner "Warning: cross_compatibility, renegotiate_apache, and nix on arm 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
+              echo "Skipping sslyze on arm."
+              continue
+            fi
             ctest --test-dir ./build -L integrationv2 --no-tests=error --output-on-failure -R "$test" --verbose
             if [ "$?" -ne 0 ]; then
                echo "Test failed, stopping execution"