Render tests: Use blocklist name for blocked tests
Pull Request: https://projects.blender.org/blender/blender/pulls/124960
This commit is contained in:
@@ -18,7 +18,7 @@ from . import global_report
|
||||
from .colored_print import (print_message, use_message_colors)
|
||||
|
||||
|
||||
def blend_list(dirpath, device, blacklist):
|
||||
def blend_list(dirpath, device, blocklist):
|
||||
import re
|
||||
|
||||
for root, dirs, files in os.walk(dirpath):
|
||||
@@ -27,8 +27,8 @@ def blend_list(dirpath, device, blacklist):
|
||||
continue
|
||||
|
||||
skip = False
|
||||
for blacklist_entry in blacklist:
|
||||
if re.match(blacklist_entry, filename):
|
||||
for blocklist_entry in blocklist:
|
||||
if re.match(blocklist_entry, filename):
|
||||
skip = True
|
||||
break
|
||||
|
||||
@@ -92,10 +92,10 @@ class Report:
|
||||
'compare_tests',
|
||||
'compare_engine',
|
||||
'device',
|
||||
'blacklist',
|
||||
'blocklist',
|
||||
)
|
||||
|
||||
def __init__(self, title, output_dir, oiiotool, device=None, blacklist=[]):
|
||||
def __init__(self, title, output_dir, oiiotool, device=None, blocklist=[]):
|
||||
self.title = title
|
||||
self.output_dir = output_dir
|
||||
self.global_dir = os.path.dirname(output_dir)
|
||||
@@ -107,7 +107,7 @@ class Report:
|
||||
self.fail_percent = 1
|
||||
self.engine_name = self.title.lower().replace(" ", "_")
|
||||
self.device = device
|
||||
self.blacklist = [] if os.getenv('BLENDER_TEST_IGNORE_BLOCKLIST') is not None else blacklist
|
||||
self.blocklist = [] if os.getenv('BLENDER_TEST_IGNORE_BLOCKLIST') is not None else blocklist
|
||||
|
||||
if device:
|
||||
self.title = self._engine_title(title, device)
|
||||
@@ -542,7 +542,7 @@ class Report:
|
||||
passed_tests = []
|
||||
failed_tests = []
|
||||
silently_failed_tests = []
|
||||
all_files = list(blend_list(dirpath, self.device, self.blacklist))
|
||||
all_files = list(blend_list(dirpath, self.device, self.blocklist))
|
||||
all_files.sort()
|
||||
print_message("Running {} tests from 1 test case." .
|
||||
format(len(all_files)),
|
||||
|
||||
Reference in New Issue
Block a user