Reorg host config (#90)

* We have been recording the host-config already, this fix displays it on the results. Signed-off-by: [email protected] <[email protected]> * Allow you to specify a directory of config files. Signed-off-by: [email protected] <[email protected]> * Update enctests/testframework/main.py Simpler way to grab a directories worth of files. Co-authored-by: Daniel Flehner Heen <[email protected]> Signed-off-by: Sam Richards <[email protected]> --------- Signed-off-by: [email protected] <[email protected]> Signed-off-by: Sam Richards <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Daniel Flehner Heen <[email protected]>
AcademySoftwareFoundation · Jan 29, 2025 · e9af967 · e9af967
1 parent 837403d
commit e9af967
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/enctests/testframework/main.py b/enctests/testframework/main.py
@@ -737,7 +737,12 @@ def main():
     # Load test config file(s)
     test_configs = []
     if args.test_config_file:
-        test_configs.append(TestSuite(Path(args.test_config_file)))
+        test_file = Path(args.test_config_file)
+        if test_file.is_dir():
+            for file in test_file.glob('*.yml'):
+                test_configs.append(TestSuite(file))
+        else:
+            test_configs.append(TestSuite(test_file))
 
     else:
         test_configs.extend(

diff --git a/enctests/testframework/templates/basicimagecompare.html.jinja b/enctests/testframework/templates/basicimagecompare.html.jinja
@@ -16,7 +16,7 @@
 
   <img src='{{ config.name }}-vmaf_harmonic_mean.png' /></BR>
 
-  Testing with ffmpeg version: {{ testinfo.ffmpeg_version}}
+  Testing with ffmpeg version: {{ testinfo.ffmpeg_version }} on OS:{{testinfo.host_config.os}} {{testinfo.host_config.os_version}} Architecture: {{testinfo.host_config.processor}}.
 
   {% for media_name, test in tests.items() %}
 

diff --git a/enctests/testframework/templates/basicmovie.html.jinja b/enctests/testframework/templates/basicmovie.html.jinja
@@ -16,7 +16,7 @@
   <img src='{{ config.name }}-vmaf_harmonic_mean.png' />
   <img src='{{ config.name }}-psnr_y_harmonic_mean.png' /></BR>
 
-  Testing with ffmpeg version: {{ testinfo.ffmpeg_version}}
+  Testing with ffmpeg version: {{ testinfo.ffmpeg_version }} on OS:{{testinfo.host_config.os}} {{testinfo.host_config.os_version}} Architecture: {{testinfo.host_config.processor}}.
 
   {% for media_name, test in tests.items() %}
 

diff --git a/enctests/testframework/templates/basicpictures.html.jinja b/enctests/testframework/templates/basicpictures.html.jinja
@@ -16,7 +16,7 @@
 
   <img src='{{ config.name }}-vmaf_harmonic_mean.png' /></BR>
 
-  Testing with ffmpeg version: {{ testinfo.ffmpeg_version}}
+  Testing with ffmpeg version: {{ testinfo.ffmpeg_version }} on OS:{{testinfo.host_config.os}} {{testinfo.host_config.os_version}} Architecture: {{testinfo.host_config.processor}}.
 
   {% for media_name, test in tests.items() %}
 

diff --git a/enctests/testframework/templates/colorweb.html.jinja b/enctests/testframework/templates/colorweb.html.jinja
@@ -16,7 +16,7 @@
 
   <img src='{{ config.name }}-max_error.png' /></BR>
 
-  Testing with ffmpeg version: {{ testinfo.ffmpeg_version}}
+  Testing with ffmpeg version: {{ testinfo.ffmpeg_version }} on OS:{{testinfo.host_config.os}} {{testinfo.host_config.os_version}} Architecture: {{testinfo.host_config.processor}}.
 
   {% for media_name, test in tests.items() %}
 

diff --git a/enctests/testframework/templates/doctests.html.jinja b/enctests/testframework/templates/doctests.html.jinja
@@ -11,7 +11,7 @@
 <body>
   <H1>{{config.title}}</H1>
   <P>{{config.description}}</P>
-  Testing with ffmpeg version: {{ testinfo.ffmpeg_version}}
+  Testing with ffmpeg version: {{ testinfo.ffmpeg_version }} on OS:{{testinfo.host_config.os}} {{testinfo.host_config.os_version}} Architecture: {{testinfo.host_config.processor}}.
 
   {% for media_name, test in tests.items() %}
 

diff --git a/enctests/testframework/utils/outputTemplate.py b/enctests/testframework/utils/outputTemplate.py
@@ -106,6 +106,9 @@ def processTemplate(config, timeline):
             merge_test_info['psnr_y_harmonic_mean'] = -1
 
           merge_test_info['filesize'] = merge_test_info['filesize']
+          if 'host_config' in test_info.metadata['aswf_enctests']:
+             #  We assume all the tests have the same values.
+             testinfo['host_config'] = test_info.metadata['aswf_enctests']['host_config']
 
           # We merge the arguments into the dictionary too, as well as merge it into a single string, to make the graphing simpler.
           args=[]