Skip to content

[test] Use Python development module with warnings as errors for testing #21157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guitargeek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[test] Use Python development module with warnings as errors for testing #21157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@ function(ROOT_ADD_PYUNITTESTS name)

string(REGEX REPLACE "[_]" "-" good_name "${name}")
ROOT_ADD_TEST(pyunittests-${good_name}
COMMAND ${Python3_EXECUTABLE} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR} -p "*.py" -v
COMMAND ${Python3_EXECUTABLE_DEV} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR} -p "*.py" -v
ENVIRONMENT PYTHONPATH=${pythonpaths_native})
endfunction()

Expand Down Expand Up @@ -2097,9 +2097,9 @@ function(ROOT_ADD_PYUNITTEST name file)
string(REPLACE "-test-" "-" clean_name_with_path ${name_with_path})

if(ARG_GENERIC)
set(test_cmd COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name})
set(test_cmd COMMAND ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name})
else()
set(test_cmd COMMAND ${Python3_EXECUTABLE} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR}/${file_dir} -p ${file_name} -v)
set(test_cmd COMMAND ${Python3_EXECUTABLE_DEV} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR}/${file_dir} -p ${file_name} -v)
endif()

set(test_name pyunittests${clean_name_with_path})
Expand Down Expand Up @@ -3026,7 +3026,7 @@ macro(ROOTTEST_SETUP_MACROTEST)
# Add python script to CTest.
elseif(ARG_MACRO MATCHES "[.]py")
get_filename_component(realfp ${ARG_MACRO} REALPATH)
set(command ${Python3_EXECUTABLE} ${realfp} ${PYROOT_EXTRAFLAGS})
set(command ${Python3_EXECUTABLE_DEV} ${realfp} ${PYROOT_EXTRAFLAGS})

elseif(DEFINED ARG_MACRO)
set(command ${root_cmd} ${ARG_MACRO})
Expand Down Expand Up @@ -3062,7 +3062,7 @@ macro(ROOTTEST_SETUP_EXECTEST)

if(MSVC)
if(${realexec} MATCHES "[.]py" AND NOT ${realexec} MATCHES "[.]exe")
set(realexec ${Python3_EXECUTABLE} ${realexec})
set(realexec ${Python3_EXECUTABLE_DEV} ${realexec})
else()
set(realexec ${realexec})
endif()
Expand Down
3 changes: 3 additions & 0 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,9 @@ if(Python3_Development_FOUND OR Python3_Development.Module_FOUND)
endif()
endif()

# The invocation of the Python 3 executable that should be used for testing:
set(Python3_EXECUTABLE_DEV ${Python3_EXECUTABLE} -X dev -W error)

#---Check for OpenGL installation-------------------------------------------------------
# OpenGL is required by various graf3d features that are enabled with opengl=ON,
# or by the Cocoa-related code that always requires it.
Expand Down
4 changes: 2 additions & 2 deletions roottest/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ configure_file(RootcpReplaceEntireFileCheck.C . COPYONLY)
# We should explicitly use the Python executable from the Python version that
# was used to build ROOT. Otherwise, we risk picking up a different Python
# version at test time.
set(PY_TOOLS_PREFIX ${Python3_EXECUTABLE} ${ROOT_BINDIR})
set(PY_TOOLS_PREFIX ${Python3_EXECUTABLE_DEV} ${ROOT_BINDIR})
set(TOOLS_PREFIX ${ROOT_BINDIR})

if(MSVC)
Expand Down Expand Up @@ -519,7 +519,7 @@ if(pyroot)
set(test_env PYTHONWARNINGS=ignore)

############################## PATTERN TESTS ############################
set (TESTPATTERN_EXE ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testPatternToFileNameAndPathSplitList.py)
set (TESTPATTERN_EXE ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/testPatternToFileNameAndPathSplitList.py)
ROOTTEST_ADD_TEST(SimplePattern1
COMMAND ${TESTPATTERN_EXE} test.root
OUTREF SimplePattern.ref
Expand Down
6 changes: 3 additions & 3 deletions roottest/python/JupyROOT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ foreach(pyfile ${pyfiles})
get_filename_component(SHORTPYFILE ${pyfile} NAME_WE)
if (NOT ${SHORTPYFILE} STREQUAL "__init__")
ROOTTEST_ADD_TEST(${SHORTPYFILE}_doctest
COMMAND ${Python3_EXECUTABLE} ${DOCTEST_LAUNCHER} ${pyfile}
COMMAND ${Python3_EXECUTABLE_DEV} ${DOCTEST_LAUNCHER} ${pyfile}
PYTHON_DEPS IPython)
endif()
endforeach()
Expand All @@ -33,7 +33,7 @@ foreach(NOTEBOOK ${NOTEBOOKS})
get_filename_component(NOTEBOOKBASE ${NOTEBOOK} NAME_WE)
ROOTTEST_ADD_TEST(${NOTEBOOKBASE}_notebook
COPY_TO_BUILDDIR ${NOTEBOOK}
COMMAND ${Python3_EXECUTABLE} ${NBDIFFUTIL} ${NOTEBOOK}
COMMAND ${Python3_EXECUTABLE_DEV} ${NBDIFFUTIL} ${NOTEBOOK}
RUN_SERIAL
PYTHON_DEPS jupyter)
endforeach()
Expand All @@ -44,7 +44,7 @@ if(imt)
get_filename_component(NOTEBOOKBASE ${IMT_NB} NAME_WE)
ROOTTEST_ADD_TEST(${NOTEBOOKBASE}_notebook
COPY_TO_BUILDDIR ${IMT_NB}
COMMAND ${Python3_EXECUTABLE} ${NBDIFFUTIL} ${IMT_NB} "OFF"
COMMAND ${Python3_EXECUTABLE_DEV} ${NBDIFFUTIL} ${IMT_NB} "OFF"
RUN_SERIAL
PYTHON_DEPS jupyter)
endif()
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/meta/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ROOTTEST_ADD_TEST(ROOT5268
PASSREGEX "error: unknown type name 'Tbrowser'")

ROOTTEST_ADD_TEST(rlibmap
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/rlibmapLauncher.py
COMMAND ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/rlibmapLauncher.py
PASSRC 1
OUTREF rlibmap.ref)

Expand Down
4 changes: 2 additions & 2 deletions roottest/root/rint/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64.*|x86.*|amd64.*|AMD64.*|i686.*|i386.*")
# All platforms except of ARM/AARCH64
ROOTTEST_ADD_TEST(TabCom
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
COMMAND ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
INPUT TabCom_input.txt
OUTCNV filterOpt.sh
OUTREF TabCom.oref
ERRREF TabCom.eref
COPY_TO_BUILDDIR MyClass.h)

ROOTTEST_ADD_TEST(BackslashNewline
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
COMMAND ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
INPUT BackslashNewline_input.txt)
endif()

Expand Down
4 changes: 2 additions & 2 deletions tutorials/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ if(geom)
endif()
# define Python GNN parsing tutorial needed to run before
if (ROOT_SONNET_FOUND AND ROOT_GRAPH_NETS_FOUND)
ROOT_ADD_TEST(tutorial-machine_learning-TMVA_SOFIE_GNN_Parser COMMAND ${Python3_EXECUTABLE}
ROOT_ADD_TEST(tutorial-machine_learning-TMVA_SOFIE_GNN_Parser COMMAND ${Python3_EXECUTABLE_DEV}
${CMAKE_CURRENT_SOURCE_DIR}/machine_learning/TMVA_SOFIE_GNN_Parser.py
PASSRC 0 FAILREGEX "Error in" ": error:" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
set (machine_learning-TMVA_SOFIE_GNN_Application-depends tutorial-machine_learning-TMVA_SOFIE_GNN_Parser)
Expand Down Expand Up @@ -1035,7 +1035,7 @@ if(pyroot)
endif()

ROOT_ADD_TEST(${tutorial_name}
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${t}
COMMAND ${Python3_EXECUTABLE_DEV} ${CMAKE_CURRENT_SOURCE_DIR}/${t}
PASSRC ${rc} FAILREGEX "Error in" ": error:" "segmentation violation"
LABELS ${labels}
DEPENDS ${tutorial_dependency}
Expand Down
Loading