From 32acc7d8353091cbd3e469c4356cfbfb756c19c4 Mon Sep 17 00:00:00 2001
From: Ivan Avdeev <me@provod.works>
Date: Thu, 6 Feb 2025 14:03:30 -0500
Subject: [PATCH] write engine logs, and also json report
also, RADV_PERFTEST=rt is no longer needed, mesa enables rt by default
now
---
render/rendertest.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/render/rendertest.py b/render/rendertest.py
index 3dea56c..4239833 100755
--- a/render/rendertest.py
+++ b/render/rendertest.py
@@ -118,14 +118,15 @@ def render():
print('Running xash3d...')
mkdir_p(f'{args.xash_dir}/valve/rendertest')
env = os.environ.copy()
- env['RADV_PERFTEST'] = 'rt'
env['LD_LIBRARY_PATH'] = '.'
- subprocess.run([f'{args.xash_dir}/xash3d', '-ref', 'vk',
- '-nowriteconfig', '-nosound', '-log',
- #'-dev', '2', '-vkverboselogs',
- '-width', '1280', '-height', '800',
- '+exec', 'rendertest.script'],
- env=env, check=True)
+
+ with open(f'{WORKDIR}/xash-stdout.log', 'wb') as stdout, open(f'{WORKDIR}/xash-stderr.log', 'wb') as stderr:
+ result = subprocess.run([f'{args.xash_dir}/xash3d', '-ref', 'vk',
+ '-nowriteconfig', '-nosound', '-log',
+ '-dev', '2',# '-vkverboselogs',
+ '-width', '1280', '-height', '800',
+ '+exec', 'rendertest.script'],
+ env=env, check=True, stdout=stdout, stderr=stderr)
def compare_one(test: str, channel: str, image_base: str, image_gold: str, image_test: str, image_diff: str):
result = subprocess.run([imagecompare, image_gold, image_test, image_diff], text=True, capture_output=True)
@@ -163,7 +164,7 @@ def compare():
diffs.append(executor.submit(compare_one, test, channel, image_base, image_gold, image_test, image_diff))
results = [diff.result() for diff in diffs]
- # json.dump(results, open(f'{WORKDIR}/data.json', 'w'))
+ json.dump(results, open(f'{WORKDIR}/test_results.json', 'w'))
jsons = json.dumps(results)
with open(f'{WORKDIR}/data.js', 'w') as js:
js.write(f'"use strict";\nconst data = {jsons};\n')