RegTest: Drop HostDisplay and add HW support

This commit is contained in:
Stenzek
2023-08-19 19:50:17 +10:00
parent a00a4391ca
commit 910abd1eac
8 changed files with 45 additions and 372 deletions

View File

@ -82,10 +82,8 @@ def check_regression_test(baselinedir, testdir, name):
write("<tr><td><img src=\"{}\" /></td><td><img src=\"{}\" /></td></tr>".format(imguri1, imguri2))
write("</table>")
num_diff += 1
if (num_diff >= 3):
return False
return True
return (num_diff > 0)
def check_regression_tests(baselinedir, testdir):

View File

@ -15,13 +15,14 @@ def is_game_path(path):
return extension in ["cue", "chd"]
def run_regression_test(runner, destdir, dump_interval, frames, gamepath):
def run_regression_test(runner, destdir, dump_interval, frames, renderer, gamepath):
args = [runner,
"-renderer", "software",
"-log", "verbose",
"-log", "error",
"-dumpdir", destdir,
"-dumpinterval", str(dump_interval),
"-frames", str(frames),
"-renderer", ("Software" if renderer is None else renderer),
"--", gamepath
]
@ -29,7 +30,7 @@ def run_regression_test(runner, destdir, dump_interval, frames, gamepath):
subprocess.run(args)
def run_regression_tests(runner, gamedir, destdir, dump_interval, frames, parallel=1):
def run_regression_tests(runner, gamedir, destdir, dump_interval, frames, parallel, renderer):
paths = glob.glob(gamedir + "/*.*", recursive=True)
gamepaths = list(filter(is_game_path, paths))
@ -44,9 +45,9 @@ def run_regression_tests(runner, gamedir, destdir, dump_interval, frames, parall
run_regression_test(runner, destdir, dump_interval, frames, game)
else:
print("Processing %u games on %u processors" % (len(gamepaths), parallel))
func = partial(run_regression_test, runner, destdir, dump_interval, frames)
func = partial(run_regression_test, runner, destdir, dump_interval, frames, renderer)
pool = multiprocessing.Pool(parallel)
pool.map(func, gamepaths)
pool.map(func, gamepaths, chunksize=1)
pool.close()
@ -60,11 +61,12 @@ if __name__ == "__main__":
parser.add_argument("-destdir", action="store", required=True, help="Base directory to dump frames to")
parser.add_argument("-dumpinterval", action="store", type=int, default=600, help="Interval to dump frames at")
parser.add_argument("-frames", action="store", type=int, default=36000, help="Number of frames to run")
parser.add_argument("-parallel", action="store", type=int, default=1, help="Number of proceeses to run")
parser.add_argument("-parallel", action="store", type=int, default=1, help="Number of processes to run")
parser.add_argument("-renderer", action="store", type=str, help="Renderer to use")
args = parser.parse_args()
if not run_regression_tests(args.runner, os.path.realpath(args.gamedir), os.path.realpath(args.destdir), args.dumpinterval, args.frames, args.parallel):
if not run_regression_tests(args.runner, os.path.realpath(args.gamedir), os.path.realpath(args.destdir), args.dumpinterval, args.frames, args.parallel, args.renderer):
sys.exit(1)
else:
sys.exit(0)