From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 10 Oct 2024 17:44:56 +0000 (-0700)
Subject: tests: allow pytests to run in out-of-tree builds
X-Git-Tag: curl-8_11_0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3601cf57143bdd70f6b91c9ee08031a3a4e7b33;p=thirdparty%2Fcurl.git

tests: allow pytests to run in out-of-tree builds

Some of the files it needs are in the build directory but the code did
not make a distinction.

Closes #15257
---

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9b6a3a42b1..ff7e115935 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -72,7 +72,6 @@ function(add_pytest _targetname _test_flags)
   endif()
   string(REPLACE " " ";" _test_flags_list "${_test_flags}")
   add_custom_target(${_targetname}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMAND pytest ${_test_flags_list} "${CMAKE_CURRENT_SOURCE_DIR}/http"
     DEPENDS "${_depends}"
     VERBATIM USES_TERMINAL
diff --git a/tests/http/testenv/client.py b/tests/http/testenv/client.py
index cb6be1ddff..3981752ec4 100644
--- a/tests/http/testenv/client.py
+++ b/tests/http/testenv/client.py
@@ -44,7 +44,7 @@ class LocalClient:
                  timeout: Optional[float] = None,
                  run_env: Optional[Dict[str,str]] = None):
         self.name = name
-        self.path = os.path.join(env.project_dir, f'tests/http/clients/{name}')
+        self.path = os.path.join(env.build_dir, f'tests/http/clients/{name}')
         self.env = env
         self._run_env = run_env
         self._timeout = timeout if timeout else env.test_timeout
diff --git a/tests/http/testenv/env.py b/tests/http/testenv/env.py
index cf6a7e0fcd..d382acf5ef 100644
--- a/tests/http/testenv/env.py
+++ b/tests/http/testenv/env.py
@@ -49,10 +49,9 @@ def init_config_from(conf_path):
 
 
 TESTS_HTTPD_PATH = os.path.dirname(os.path.dirname(__file__))
-DEF_CONFIG = init_config_from(os.path.join(TESTS_HTTPD_PATH, 'config.ini'))
-
-TOP_PATH = os.path.dirname(os.path.dirname(TESTS_HTTPD_PATH))
-CURL = os.path.join(TOP_PATH, 'src/curl')
+TOP_PATH = os.path.join(os.getcwd(), os.path.pardir)
+DEF_CONFIG = init_config_from(os.path.join(TOP_PATH, 'tests', 'http', 'config.ini'))
+CURL = os.path.join(TOP_PATH, 'src', 'curl')
 
 
 class EnvConfig:
@@ -61,6 +60,7 @@ class EnvConfig:
         self.tests_dir = TESTS_HTTPD_PATH
         self.gen_dir = os.path.join(self.tests_dir, 'gen')
         self.project_dir = os.path.dirname(os.path.dirname(self.tests_dir))
+        self.build_dir = TOP_PATH
         self.config = DEF_CONFIG
         # check cur and its features
         self.curl = CURL
@@ -437,6 +437,10 @@ class Env:
     def project_dir(self) -> str:
         return self.CONFIG.project_dir
 
+    @property
+    def build_dir(self) -> str:
+        return self.CONFIG.build_dir
+
     @property
     def ca(self):
         return self._ca