Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 42 lines 1.5 kB view raw
1diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 2index 5c1b40af4..917451dee 100644 3--- a/tests/CMakeLists.txt 4+++ b/tests/CMakeLists.txt 5@@ -59,13 +59,14 @@ if(USE_IMAGE_COMPARE_PY) 6 7 # Since msys2 on Windows prefers bin/ over Scripts, we need to look for the actual folder to determine 8 # how to utilize the venv 9- find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE) 10- if(WIN32) 11- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe") 12- else() 13- set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python") 14- endif() 15- if(EXISTS "${IMAGE_COMPARE_EXE}") 16+ # find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE) 17+ # if(WIN32) 18+ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe") 19+ # else() 20+ # set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python") 21+ # endif() 22+ set(IMAGE_COMPARE_EXE "python3") 23+ # if(EXISTS "${IMAGE_COMPARE_EXE}") 24 message(STATUS "venv found, testing libraries") 25 execute_process( 26 COMMAND "${IMAGE_COMPARE_EXE}" "${CCSD}/image_compare.py" "--status" 27@@ -77,10 +78,10 @@ if(USE_IMAGE_COMPARE_PY) 28 message(STATUS "venv libraries complete") 29 set(BUILD_VENV FALSE) 30 endif() 31- else() 32- message(STATUS "venv not found") 33- set(BUILD_VENV TRUE) 34- endif() 35+ # else() 36+ # message(STATUS "venv not found") 37+ # set(BUILD_VENV TRUE) 38+ # endif() 39 if(BUILD_VENV) 40 message(STATUS "Setting up testing venv for image comparison") 41 execute_process( 42