From d65929c2fca33c08b22f13e703c93cadd3dd8ef5 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Mon, 10 Jul 2023 17:47:20 +0200
Subject: [PATCH 1/2] Add automated tests for Storm, with both Hydra and USD
 export methods

Needs WITH_OPENGL_RENDER_TESTS CMake option to be enabled.

I couldn't actually get it to work yet but I assume it will work after
BogdanNagirniak/blender#61.
---
 tests/python/CMakeLists.txt        | 27 +++++++++
 tests/python/storm_render_tests.py | 97 ++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 tests/python/storm_render_tests.py

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 8f080926f5d3..100f97290228 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -663,6 +663,33 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
           -outdir "${TEST_OUT_DIR}/workbench"
         )
       endforeach()
+
+      if(WITH_HYDRA)
+        # Hydra Storm
+        foreach(render_test ${render_tests})
+          add_python_test(
+            hydra_storm_${render_test}_test
+            ${CMAKE_CURRENT_LIST_DIR}/storm_render_tests.py
+            -blender "${TEST_BLENDER_EXE}"
+            -testdir "${TEST_SRC_DIR}/render/${render_test}"
+            -idiff "${OPENIMAGEIO_IDIFF}"
+            -outdir "${TEST_OUT_DIR}/hydra_storm"
+            -export_method "HYDRA"
+          )
+        endforeach()
+
+        foreach(render_test ${render_tests})
+          add_python_test(
+            usd_storm_${render_test}_test
+            ${CMAKE_CURRENT_LIST_DIR}/storm_render_tests.py
+            -blender "${TEST_BLENDER_EXE}"
+            -testdir "${TEST_SRC_DIR}/render/${render_test}"
+            -idiff "${OPENIMAGEIO_IDIFF}"
+            -outdir "${TEST_OUT_DIR}/usd_storm"
+            -export_method "USD"
+          )
+        endforeach()
+      endif()
     endif()
   endif()
 endif()
diff --git a/tests/python/storm_render_tests.py b/tests/python/storm_render_tests.py
new file mode 100644
index 000000000000..adf746087d6d
--- /dev/null
+++ b/tests/python/storm_render_tests.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+# SPDX-FileCopyrightText: 2015-2023 Blender Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import argparse
+import os
+import platform
+import shlex
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+
+def setup():
+    import bpy
+    import addon_utils
+
+    addon_utils.enable("hydra_storm")
+
+    for scene in bpy.data.scenes:
+        scene.render.engine = 'HYDRA_STORM'
+        scene.hydra.export_method = os.environ['BLENDER_HYDRA_EXPORT_METHOD']
+
+
+# When run from inside Blender, render and exit.
+try:
+    import bpy
+    inside_blender = True
+except ImportError:
+    inside_blender = False
+
+if inside_blender:
+    try:
+        setup()
+    except Exception as e:
+        print(e)
+        sys.exit(1)
+
+
+def get_arguments(filepath, output_filepath):
+    return [
+        "--background",
+        "-noaudio",
+        "--factory-startup",
+        "--enable-autoexec",
+        "--debug-memory",
+        "--debug-exit-on-error",
+        filepath,
+        "-P",
+        os.path.realpath(__file__),
+        "-o", output_filepath,
+        "-F", "PNG",
+        "-f", "1"]
+
+
+def create_argparse():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-blender", nargs="+")
+    parser.add_argument("-testdir", nargs=1)
+    parser.add_argument("-outdir", nargs=1)
+    parser.add_argument("-idiff", nargs=1)
+    parser.add_argument("-export_method", nargs=1)
+    return parser
+
+
+def main():
+    parser = create_argparse()
+    args = parser.parse_args()
+
+    blender = args.blender[0]
+    test_dir = args.testdir[0]
+    idiff = args.idiff[0]
+    output_dir = args.outdir[0]
+    export_method = args.export_method[0]
+
+    from modules import render_report
+
+    name = "Storm Hydra" if export_method == 'HYDRA' else 'Storm USD'
+
+    report = render_report.Report(name, output_dir, idiff)
+    report.set_pixelated(True)
+    report.set_reference_dir("storm_renders")
+    report.set_compare_engine('cycles', 'CPU')
+
+    test_dir_name = Path(test_dir).name
+
+    os.environ['BLENDER_HYDRA_EXPORT_METHOD'] = export_method
+
+    ok = report.run(test_dir, blender, get_arguments, batch=True)
+
+    sys.exit(not ok)
+
+
+if not inside_blender and __name__ == "__main__":
+    main()
-- 
2.30.2


From 139778889608ea075f8e872b4bb16b8c49609862 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Thu, 13 Jul 2023 20:12:03 +0200
Subject: [PATCH 2/2] Add comparison between USD Storm and Hydra Storm

---
 tests/python/storm_render_tests.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/python/storm_render_tests.py b/tests/python/storm_render_tests.py
index adf746087d6d..4fa1f365cc97 100644
--- a/tests/python/storm_render_tests.py
+++ b/tests/python/storm_render_tests.py
@@ -82,7 +82,11 @@ def main():
     report = render_report.Report(name, output_dir, idiff)
     report.set_pixelated(True)
     report.set_reference_dir("storm_renders")
-    report.set_compare_engine('cycles', 'CPU')
+
+    if export_method == 'HYDRA':
+        report.set_compare_engine('cycles', 'CPU')
+    else:
+        report.set_compare_engine('hydra_storm')
 
     test_dir_name = Path(test_dir).name
 
-- 
2.30.2