Merge 6967bcb into 8e17480

.github/workflows/windows-native.yml

@@ -114,7 +114,10 @@ jobs:
         # There is another one instance of ssl at /mingw and /mingw/bin is always at the first position at PATH
         if: matrix.backend == 'openssl'
         shell: bash
-        run: echo OPENSSL_ROOT_DIR=${{ env.VCPKG_DIR }}/installed >> $GITHUB_ENV
+        run: |
+          echo OPENSSL_ROOT_DIR=${{ env.VCPKG_DIR }}/installed >> $GITHUB_ENV
+          ls -la ${{ env.VCPKG_DIR }}/installed/x64-windows
+          ls -la ${{ env.VCPKG_DIR }}/installed/vcpkg
 
       - name: Adjust settings for s2k_iteration_tuning test
         # This step adjusts s2k_iteration_tuning threshold for

src/tests/cli_common.py

@@ -1,10 +1,10 @@
 import sys
-import distutils.spawn
 import random
 import string
 import logging
 import os
 import re
+import shutil
 from subprocess import Popen, PIPE
 
 RNP_ROOT = None
@@ -78,7 +78,7 @@ def file_text(path, encoding = CONSOLE_ENCODING):
         return f.read().decode(encoding).replace('\r\r', '\r')
 
 def find_utility(name, exitifnone = True):
-    path = distutils.spawn.find_executable(name)
+    path = shutil.which(name)
     if not path and exitifnone:
         logging.error('Cannot find utility {}. Exiting.'.format(name))
         sys.exit(1)