diff options
Diffstat (limited to 'tests/python')
-rw-r--r-- | tests/python/CMakeLists.txt | 16 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/alembic_tests.py | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/cycles_render_tests.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/eevee_render_tests.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/ffmpeg_tests.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/opengl_draw_tests.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/python/workbench_render_tests.py | 0 |
7 files changed, 7 insertions, 11 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 2d6dc4af40e..a3df01fdbe2 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -48,18 +48,14 @@ endfunction() # Run Python script outside Blender. function(add_python_test testname testscript) - if(MSVC) - add_test( - NAME ${testname} - COMMAND ${TEST_PYTHON_EXE} ${testscript} ${ARGN} - ) - else() - add_test( - NAME ${testname} - COMMAND ${testscript} ${ARGN} - ) + if(NOT TEST_PYTHON_EXE) + message(FATAL_ERROR "No Python configured for running tests, set TEST_PYTHON_EXE.") endif() + add_test( + NAME ${testname} + COMMAND ${TEST_PYTHON_EXE} ${testscript} ${ARGN} + ) set_tests_properties(${testname} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0) endfunction() diff --git a/tests/python/alembic_tests.py b/tests/python/alembic_tests.py index 875e17e97f0..2d477c5a6f0 100755..100644 --- a/tests/python/alembic_tests.py +++ b/tests/python/alembic_tests.py @@ -76,7 +76,7 @@ class AbstractAlembicTest(AbstractBlenderRunnerTest): output = output.replace('\r\n', '\n').replace('\r', '\n') if proc.returncode: - raise AbcPropError('Error %d running abcls:\n%s' % (proc.returncode, output)) + raise AbcPropError('Error %d running %s:\n%s' % (proc.returncode, ' '.join(command), output)) # Mapping from value type to callable that can convert a string to Python values. converters = { diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py index 79ba11fdd44..79ba11fdd44 100755..100644 --- a/tests/python/cycles_render_tests.py +++ b/tests/python/cycles_render_tests.py diff --git a/tests/python/eevee_render_tests.py b/tests/python/eevee_render_tests.py index a7130136d0a..a7130136d0a 100755..100644 --- a/tests/python/eevee_render_tests.py +++ b/tests/python/eevee_render_tests.py diff --git a/tests/python/ffmpeg_tests.py b/tests/python/ffmpeg_tests.py index 92734b5bc7d..92734b5bc7d 100755..100644 --- a/tests/python/ffmpeg_tests.py +++ b/tests/python/ffmpeg_tests.py diff --git a/tests/python/opengl_draw_tests.py b/tests/python/opengl_draw_tests.py index ab4df63afd9..ab4df63afd9 100755..100644 --- a/tests/python/opengl_draw_tests.py +++ b/tests/python/opengl_draw_tests.py diff --git a/tests/python/workbench_render_tests.py b/tests/python/workbench_render_tests.py index 155b54098a8..155b54098a8 100755..100644 --- a/tests/python/workbench_render_tests.py +++ b/tests/python/workbench_render_tests.py |