646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 5c1b40af4..917451dee 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -59,13 +59,14 @@ if(USE_IMAGE_COMPARE_PY)
|
|
|
|
# Since msys2 on Windows prefers bin/ over Scripts, we need to look for the actual folder to determine
|
|
# how to utilize the venv
|
|
- find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
|
|
- if(WIN32)
|
|
- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
|
|
- else()
|
|
- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
|
|
- endif()
|
|
- if(EXISTS "${IMAGE_COMPARE_EXE}")
|
|
+ # find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
|
|
+ # if(WIN32)
|
|
+ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
|
|
+ # else()
|
|
+ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
|
|
+ # endif()
|
|
+ set(IMAGE_COMPARE_EXE "python3")
|
|
+ # if(EXISTS "${IMAGE_COMPARE_EXE}")
|
|
message(STATUS "venv found, testing libraries")
|
|
execute_process(
|
|
COMMAND "${IMAGE_COMPARE_EXE}" "${CCSD}/image_compare.py" "--status"
|
|
@@ -77,10 +78,10 @@ if(USE_IMAGE_COMPARE_PY)
|
|
message(STATUS "venv libraries complete")
|
|
set(BUILD_VENV FALSE)
|
|
endif()
|
|
- else()
|
|
- message(STATUS "venv not found")
|
|
- set(BUILD_VENV TRUE)
|
|
- endif()
|
|
+ # else()
|
|
+ # message(STATUS "venv not found")
|
|
+ # set(BUILD_VENV TRUE)
|
|
+ # endif()
|
|
if(BUILD_VENV)
|
|
message(STATUS "Setting up testing venv for image comparison")
|
|
execute_process(
|
|
|