diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a9976c3b2f..0d271208589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -811,11 +811,6 @@ Enable GPU render related unit testing using Vulkan" OFF ) mark_as_advanced(WITH_GPU_RENDER_TESTS_VULKAN) -option(WITH_GPU_RENDER_TESTS_SILENT "\ -Run GPU render tests silently (finished tests will pass). \ -Generated report will show failing tests" - ON -) option(WITH_GPU_RENDER_TESTS_HEADED "\ Enable GPU render related unit testing that doesn't work in background mode. \ These tests require an environment with a display server to run. \ diff --git a/build_files/cmake/config/blender_developer.cmake b/build_files/cmake/config/blender_developer.cmake index 939a9f12a92..0e563669a0c 100644 --- a/build_files/cmake/config/blender_developer.cmake +++ b/build_files/cmake/config/blender_developer.cmake @@ -20,7 +20,6 @@ endif() set(WITH_CYCLES_NATIVE_ONLY ON CACHE BOOL "" FORCE) set(WITH_DOC_MANPAGE OFF CACHE BOOL "" FORCE) set(WITH_GTESTS ON CACHE BOOL "" FORCE) -set(WITH_GPU_RENDER_TESTS_SILENT OFF CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS OFF CACHE BOOL "" FORCE) set(WITH_PYTHON_SAFETY ON CACHE BOOL "" FORCE) if(WIN32) diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 1c00dd471ca..ccc12836946 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -24,7 +24,7 @@ if NOT "%1" == "" ( ) else if "%1" == "with_tests" ( set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GTESTS=On ) else if "%1" == "with_gpu_tests" ( - set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GPU_BACKEND_TESTS=On -DWITH_GPU_DRAW_TESTS=On -DWITH_GPU_RENDER_TESTS=On -DWITH_GPU_RENDER_TESTS_SILENT=Off + set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GPU_BACKEND_TESTS=On -DWITH_GPU_DRAW_TESTS=On -DWITH_GPU_RENDER_TESTS=On ) else if "%1" == "full" ( set TARGET=Full set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index e93bd9cc7f9..6d5f6131e32 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -751,9 +751,6 @@ if((WITH_CYCLES OR WITH_GPU_RENDER_TESTS) AND TEST_SRC_DIR_EXISTS) list(FILTER gpu_render_tests EXCLUDE REGEX light_group|shadow_catcher|denoise|guiding|reports) set(_gpu_render_tests_arguments) - if(WITH_GPU_RENDER_TESTS_SILENT) - list(APPEND _gpu_render_tests_arguments --fail-silently) - endif() # Eevee Next if(WITH_OPENGL_BACKEND) diff --git a/tests/python/eevee_next_render_tests.py b/tests/python/eevee_next_render_tests.py index 22c172a786e..a1cbf360cc0 100644 --- a/tests/python/eevee_next_render_tests.py +++ b/tests/python/eevee_next_render_tests.py @@ -229,7 +229,6 @@ def create_argparse(): parser.add_argument("--outdir", required=True) parser.add_argument("--oiiotool", required=True) parser.add_argument('--batch', default=False, action='store_true') - parser.add_argument('--fail-silently', default=False, action='store_true') parser.add_argument('--gpu-backend') return parser @@ -287,7 +286,7 @@ def main(): # Noise difference in transparent material report.set_fail_threshold(0.05) - ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch, fail_silently=args.fail_silently) + ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch) sys.exit(not ok) diff --git a/tests/python/overlay_render_tests.py b/tests/python/overlay_render_tests.py index 863f390a886..f7d259bb730 100644 --- a/tests/python/overlay_render_tests.py +++ b/tests/python/overlay_render_tests.py @@ -64,7 +64,6 @@ def create_argparse(): parser.add_argument("--outdir", required=True) parser.add_argument("--oiiotool", required=True) parser.add_argument('--batch', default=False, action='store_true') - parser.add_argument('--fail-silently', default=False, action='store_true') parser.add_argument('--gpu-backend') return parser @@ -85,7 +84,7 @@ def main(): if test_dir_name.startswith('hair') and platform.system() == "Darwin": report.set_fail_threshold(0.050) - ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch, fail_silently=args.fail_silently) + ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch) sys.exit(not ok) diff --git a/tests/python/storm_render_tests.py b/tests/python/storm_render_tests.py index b1ec6546707..ad7bf72d43e 100644 --- a/tests/python/storm_render_tests.py +++ b/tests/python/storm_render_tests.py @@ -106,7 +106,6 @@ def create_argparse(): parser.add_argument("--oiiotool", required=True) parser.add_argument("--export_method", required=True) parser.add_argument('--batch', default=False, action='store_true') - parser.add_argument('--fail-silently', default=False, action='store_true') return parser @@ -142,7 +141,7 @@ def main(): os.environ['BLENDER_HYDRA_EXPORT_METHOD'] = args.export_method - ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch, fail_silently=args.fail_silently) + ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch) sys.exit(not ok) diff --git a/tests/python/workbench_render_tests.py b/tests/python/workbench_render_tests.py index 3e78e9cf48f..4ef952356a0 100644 --- a/tests/python/workbench_render_tests.py +++ b/tests/python/workbench_render_tests.py @@ -82,7 +82,6 @@ def create_argparse(): parser.add_argument("--outdir", required=True) parser.add_argument("--oiiotool", required=True) parser.add_argument('--batch', default=False, action='store_true') - parser.add_argument('--fail-silently', default=False, action='store_true') parser.add_argument('--gpu-backend') return parser @@ -103,7 +102,7 @@ def main(): if test_dir_name.startswith('hair') and platform.system() == "Darwin": report.set_fail_threshold(0.050) - ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch, fail_silently=args.fail_silently) + ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch) sys.exit(not ok)