Skip to content

Commit 97bb610

Browse files
committed
feat cmake: use the same venv for all userver testsuite tests
91b7c672b03c31afcd2730480c76612dd3d0d12f
1 parent 16f9c23 commit 97bb610

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

cmake/UserverTestsuite.cmake

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,22 @@ function(userver_testsuite_add)
194194
"PYTHON_BINARY and REQUIREMENTS options are incompatible")
195195
endif()
196196
set(python_binary "${ARG_PYTHON_BINARY}")
197-
else()
197+
elseif(ARG_REQUIREMENTS)
198198
userver_testsuite_requirements(REQUIREMENTS_FILES_VAR requirements_files)
199199
list(APPEND requirements_files ${ARG_REQUIREMENTS})
200200
userver_venv_setup(
201201
NAME "${TESTSUITE_TARGET}"
202202
REQUIREMENTS ${requirements_files}
203203
PYTHON_OUTPUT_VAR python_binary
204204
)
205+
else()
206+
userver_testsuite_requirements(REQUIREMENTS_FILES_VAR requirements_files)
207+
userver_venv_setup(
208+
NAME userver-default
209+
REQUIREMENTS ${requirements_files}
210+
PYTHON_OUTPUT_VAR python_binary
211+
UNIQUE
212+
)
205213
endif()
206214

207215
if(NOT python_binary)

samples/mongo-support/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ add_executable(${PROJECT_NAME} ${SOURCES})
88
target_link_libraries(${PROJECT_NAME} userver::mongo)
99

1010
# /// [testsuite - cmake]
11-
userver_testsuite_add_simple(
12-
PYTHON_BINARY "${TESTSUITE_PYTHON_BINARY}"
13-
)
11+
userver_testsuite_add_simple()
1412
# /// [testsuite - cmake]

samples/postgres-support/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
77
add_executable(${PROJECT_NAME} ${SOURCES})
88
target_link_libraries(${PROJECT_NAME} userver::postgresql)
99

10-
userver_testsuite_add_simple(
11-
PYTHON_BINARY "${TESTSUITE_PYTHON_BINARY}"
12-
)
10+
userver_testsuite_add_simple()

0 commit comments

Comments
 (0)