From 27041e43515b1e76ce5f1a4c577eecf4ef47a05c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Oct 2024 20:27:31 +0530
Subject: [PATCH] Move the DLL dir add to where it's actually needed

---
 setup/test.py   | 21 ++++++++++++++-------
 setup/win-ci.py |  3 ---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/setup/test.py b/setup/test.py
index 1a82e0d454..2a4d93d290 100644
--- a/setup/test.py
+++ b/setup/test.py
@@ -6,7 +6,7 @@ import os
 import subprocess
 import sys
 
-from setup import Command, is_ci, ismacos
+from setup import Command, is_ci, ismacos, iswindows
 
 TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc dbcli ebooks'.split())
 
@@ -54,12 +54,19 @@ class Test(BaseTest):
         import warnings
         warnings.filterwarnings('ignore', message="'cgi' is deprecated and slated for removal in Python 3.13")
 
-        if is_ci and ismacos:
-            import ctypes
-            sys.libxml2_dylib = ctypes.CDLL(os.path.join(os.environ['SW'], 'lib', 'libxml2.dylib'))
-            sys.libxslt_dylib = ctypes.CDLL(os.path.join(os.environ['SW'], 'lib', 'libxslt.dylib'))
-            sys.libexslt_dylib = ctypes.CDLL(os.path.join(os.environ['SW'], 'lib', 'libexslt.dylib'))
-            print(sys.libxml2_dylib, sys.libxslt_dylib, sys.libexslt_dylib, file=sys.stderr, flush=True)
+        if is_ci:
+            SW = os.environ['SW']
+            if ismacos:
+                import ctypes
+                sys.libxml2_dylib = ctypes.CDLL(os.path.join(SW, 'lib', 'libxml2.dylib'))
+                sys.libxslt_dylib = ctypes.CDLL(os.path.join(SW, 'lib', 'libxslt.dylib'))
+                sys.libexslt_dylib = ctypes.CDLL(os.path.join(SW, 'lib', 'libexslt.dylib'))
+                print(sys.libxml2_dylib, sys.libxslt_dylib, sys.libexslt_dylib, file=sys.stderr, flush=True)
+            elif iswindows:
+                ffmpeg_dll_dir = os.path.join(SW, 'ffmpeg', 'bin')
+                os.add_dll_directory(ffmpeg_dll_dir)
+
+
         from calibre.utils.run_tests import filter_tests_by_name, find_tests, remove_tests_by_name, run_cli
         tests = find_tests(which_tests=frozenset(opts.test_module), exclude_tests=frozenset(opts.exclude_test_module))
         if opts.test_name:
diff --git a/setup/win-ci.py b/setup/win-ci.py
index a310117ece..ae1160ee11 100644
--- a/setup/win-ci.py
+++ b/setup/win-ci.py
@@ -86,9 +86,6 @@ def setup_env():
     os.environ['CI'] = 'true'
     os.environ['OPENSSL_MODULES'] = os.path.join(SW, 'lib', 'ossl-modules')
     os.environ['PIPER_TTS_DIR'] = os.path.join(SW, 'piper')
-    ffmpeg_dll_dir = os.path.join(SW, 'ffmpeg', 'bin')
-    if os.path.exists(ffmpeg_dll_dir):  # doesnt exist in install phase
-        os.add_dll_directory(ffmpeg_dll_dir)
 
 
 def main():