Guard new hashlib ctor test

Author: WillChilds-Klein

Lib/test/test_hashlib.py

@@ -274,7 +274,10 @@ def test_clinic_signature(self):
                 with self.assertWarnsRegex(DeprecationWarning,
                                            DEPRECATED_STRING_PARAMETER):
                     hashlib.new(digest_name, string=b'')
-                if self._hashlib:
+                # when using a combination of libcrypto and interned hash
+                # implementations, we need to make sure that _hashlib contains
+                # the constructor we're testing
+                if self._hashlib and digest_name in self._hashlib._constructors:
                     self._hashlib.new(digest_name, b'')
                     self._hashlib.new(digest_name, data=b'')
                     with self.assertWarnsRegex(DeprecationWarning,

Tools/ssl/multissltests.py

@@ -486,6 +486,7 @@ def _build_src(self, config_args=()):
             "-DCMAKE_PREFIX_PATH={}".format(self.install_dir),
             "-DCMAKE_INSTALL_PREFIX={}".format(self.install_dir),
             "-DBUILD_SHARED_LIBS=ON",
+            "-DBUILD_TESTING=OFF",
             "-DFIPS=OFF",
         ]
         self._subprocess_call(cmd, cwd=cwd, env=env)