Skip to content

Commit b618cb5

Browse files
committed
[cmake] Simplify logic disabling runPyClassTest.C on Windows
1 parent 97639fd commit b618cb5

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

roottest/python/cling/CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ if(ROOT_pyroot_FOUND)
88
# TPython::LoadMacro and TPython::Import are broken in the new Cppyy
99
# https://bitbucket.org/wlav/cppyy/issues/65
1010
# For now, we rely on our own implementation of TPython
11-
if(NOT MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8 OR llvm13_broken_tests)
12-
if(NOT MSVC OR "${CMAKE_GENERATOR_PLATFORM}" MATCHES "Win32" OR win_broken_tests)
13-
ROOTTEST_ADD_TEST(class MACRO
14-
runPyClassTest.C
15-
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
16-
OUTREF PyClassTest.ref)
17-
endif()
11+
if(NOT MSVC OR win_broken_tests)
12+
ROOTTEST_ADD_TEST(class MACRO
13+
runPyClassTest.C
14+
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
15+
OUTREF PyClassTest.ref)
1816
endif()
1917

2018
ROOTTEST_ADD_TEST(cling

0 commit comments

Comments
 (0)