GPU: Remove WITH_GPU_RENDER_TESTS_SILENT option
This was introduced during EEVEE-next developement cycle to not make the buildbot fail because of EEVEE render tests. These have stabilized now and we can remove this option. Pull Request: https://projects.blender.org/blender/blender/pulls/137545
This commit is contained in:
committed by
Clément Foucault
parent
846d88ed17
commit
dde18802a5
@@ -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. \
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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% ^
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user