@@ -1965,9 +1965,10 @@ endfunction()
19651965# [COPY_TO_BUILDDIR copy_file1 copy_file1 ...]
19661966# [ENVIRONMENT var1=val1 var2=val2 ...]
19671967# [PYTHON_DEPS dep_x dep_y ...] # Communicate that this test requires python packages. A fixture checking for these will be run before the test.)
1968+ # [FIXTURES_SETUP ...] [FIXTURES_CLEANUP ...] [FIXTURES_REQUIRED ...]
19681969#----------------------------------------------------------------------------
19691970function (ROOT_ADD_PYUNITTEST name file)
1970- CMAKE_PARSE_ARGUMENTS (ARG "WILLFAIL;GENERIC" "" "COPY_TO_BUILDDIR;ENVIRONMENT;PYTHON_DEPS" ${ARGN} )
1971+ CMAKE_PARSE_ARGUMENTS (ARG "WILLFAIL;GENERIC" "" "COPY_TO_BUILDDIR;ENVIRONMENT;PYTHON_DEPS;FIXTURES_SETUP;FIXTURES_CLEANUP;FIXTURES_REQUIRED " ${ARGN} )
19711972 if (MSVC )
19721973 set (ROOT_ENV ROOTSYS=${ROOTSYS}
19731974 PYTHONPATH=${ROOTSYS} /bin;$ENV{PYTHONPATH} )
@@ -2007,13 +2008,30 @@ function(ROOT_ADD_PYUNITTEST name file)
20072008 set (test_cmd COMMAND ${Python3_EXECUTABLE} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR} /${file_dir} -p ${file_name} -v)
20082009 endif ()
20092010
2010- ROOT_ADD_TEST(pyunittests${clean_name_with_path}
2011+ set (test_name pyunittests${clean_name_with_path} )
2012+ ROOT_ADD_TEST(${test_name}
20112013 ${test_cmd}
20122014 ENVIRONMENT ${ROOT_ENV} ${ARG_ENVIRONMENT}
20132015 LABELS ${labels}
20142016 ${copy_to_builddir}
20152017 ${will_fail}
20162018 PYTHON_DEPS ${ARG_PYTHON_DEPS} )
2019+
2020+ if (ARG_FIXTURES_SETUP)
2021+ set_property (TEST ${test_name} PROPERTY
2022+ FIXTURES_SETUP ${ARG_FIXTURES_SETUP} )
2023+ endif ()
2024+
2025+ if (ARG_FIXTURES_CLEANUP)
2026+ set_property (TEST ${test_name} PROPERTY
2027+ FIXTURES_CLEANUP ${ARG_FIXTURES_CLEANUP} )
2028+ endif ()
2029+
2030+ if (ARG_FIXTURES_REQUIRED)
2031+ set_property (TEST ${test_name} PROPERTY
2032+ FIXTURES_REQUIRED ${ARG_FIXTURES_REQUIRED} )
2033+ endif ()
2034+
20172035endfunction ()
20182036
20192037#----------------------------------------------------------------------------
0 commit comments