Introduce ScopeGuard to ensure streams are flushed.

Address typo and minor cleanup.

Author: ashwinbhat

source/MaterialXTest/MaterialXRender/RenderUtil.cpp

@@ -19,6 +19,26 @@
 
 namespace mx = MaterialX;
 
+namespace
+{
+
+// RAII helper that invokes a callable on scope exit (normal or exception).
+template <typename F>
+class ScopeGuard
+{
+  public:
+    explicit ScopeGuard(F fn) : _fn(std::move(fn)) {}
+    ~ScopeGuard() { _fn(); }
+
+    ScopeGuard(const ScopeGuard&) = delete;
+    ScopeGuard& operator=(const ScopeGuard&) = delete;
+
+  private:
+    F _fn;
+};
+
+} // anonymous namespace
+
 namespace RenderUtil
 {
 
@@ -45,6 +65,15 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
     _logger.start(target, _testRun.options);
     _profiler.start();
 
+    // Ensure cleanup on any exit path (normal return or exception).
+    ScopeGuard cleanup([this]() {
+        _profiler.end(_testRun.options, _logger.profilingLog(), _testRun.dependLib);
+        _logger.end();
+#ifdef MATERIALX_BUILD_PERFETTO_TRACING
+        _tracer.end();
+#endif
+    });
+
     // Data search path
     _testRun.searchPath = mx::getDefaultDataSearchPath();
 
@@ -81,12 +110,6 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
         }
     }
 
-    _profiler.end(_testRun.options, _logger.profilingLog(), _testRun.dependLib);
-    _logger.end();
-#ifdef MATERIALX_BUILD_PERFETTO_TRACING
-    _tracer.end();
-#endif
-
     return true;
 }
 
@@ -105,7 +128,7 @@ void ShaderRenderTester::loadDependentLibraries()
         }
     }
 
-    // Load any addition per renderer libraries
+    // Load any additional per-renderer libraries
     loadAdditionalLibraries(_testRun.dependLib, _testRun.options);
 }
 
@@ -131,17 +154,6 @@ void ShaderRenderTester::getGenerationOptions(const GenShaderUtil::TestSuiteOpti
     }
 }
 
-void ShaderRenderTester::printRunLog(const RenderProfileTimes &profileTimes,
-                                     const GenShaderUtil::TestSuiteOptions& options,
-                                     std::ostream& stream,
-                                     mx::DocumentPtr)
-{
-    profileTimes.print(stream);
-
-    stream << "---------------------------------------" << std::endl;
-    options.print(stream);
-}
-
 void ShaderRenderTester::addAdditionalTestStreams(mx::MeshPtr mesh)
 {
     size_t vertexCount = mesh->getVertexCount();

source/MaterialXTest/MaterialXRender/RenderUtil.h

@@ -14,6 +14,7 @@
 #include <MaterialXRender/Util.h>
 
 #include <fstream>
+#include <iostream>
 #include <memory>
 
 #define LOG_TO_FILE
@@ -225,12 +226,6 @@ class ShaderRenderTester
                               const mx::GenOptions& originalOptions,
                               std::vector<mx::GenOptions>& optionsList);
 
-    // Print execution summary
-    void printRunLog(const RenderProfileTimes &profileTimes,
-                     const GenShaderUtil::TestSuiteOptions& options,
-                     std::ostream& stream,
-                     mx::DocumentPtr dependLib);
-
     // If these streams don't exist add them for testing purposes
     void addAdditionalTestStreams(mx::MeshPtr mesh);