4 files changed, 13 insertions, 7 deletions
diff --git a/test/src/mbgl/test/stub_render_source_observer.hpp b/test/src/mbgl/test/stub_render_source_observer.hpp
index ff20fff80c..7aa9e7714a 100644
--- a/test/src/mbgl/test/stub_render_source_observer.hpp
+++ b/test/src/mbgl/test/stub_render_source_observer.hpp
@@ -13,9 +13,12 @@ public:
         if (tileChanged) tileChanged(source, tileID);
     };
 
-    void
-    onTileError(RenderSource& source, const OverscaledTileID& tileID, std::exception_ptr error) override {
-        if (tileError) tileError(source, tileID, error);
+    void onTileError(RenderSource& source,
+                     const OverscaledTileID& tileID,
+                     std::exception_ptr error,
+                     EventSeverity) override {
+        if (tileError)
+            tileError(source, tileID, error);
     }
 
     std::function<void (RenderSource&, const OverscaledTileID&)> tileChanged;
diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp
index b97911cdb0..f8b19aeaff 100644
--- a/test/src/mbgl/test/stub_style_observer.hpp
+++ b/test/src/mbgl/test/stub_style_observer.hpp
@@ -18,7 +18,7 @@ public:
         if (sourceChanged) sourceChanged(source);
     }
 
-    void onSourceError(Source& source, std::exception_ptr error) override {
+    void onSourceError(Source& source, std::exception_ptr error, EventSeverity) override {
         if (sourceError) sourceError(source, error);
     }
 
@@ -26,7 +26,7 @@ public:
         if (sourceDescriptionChanged) sourceDescriptionChanged(source);
     }
 
-    void onResourceError(std::exception_ptr error) override {
+    void onResourceError(std::exception_ptr error, EventSeverity) override {
         if (resourceError) resourceError(error);
     };
 
diff --git a/test/src/mbgl/test/stub_tile_observer.hpp b/test/src/mbgl/test/stub_tile_observer.hpp
index 43ae4d8360..720ee8739f 100644
--- a/test/src/mbgl/test/stub_tile_observer.hpp
+++ b/test/src/mbgl/test/stub_tile_observer.hpp
@@ -13,7 +13,7 @@ public:
         if (tileChanged) tileChanged(tile);
     }
 
-    void onTileError(Tile& tile, std::exception_ptr error) override {
+    void onTileError(Tile& tile, std::exception_ptr error, EventSeverity) override {
         if (tileError) tileError(tile, error);
     }
 
diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp
index 0b1034e315..8b3db8bd95 100644
--- a/test/src/mbgl/test/util.cpp
+++ b/test/src/mbgl/test/util.cpp
@@ -100,7 +100,10 @@ Server::~Server() {
 
 PremultipliedImage render(Map& map, OffscreenView& view) {
     PremultipliedImage result;
-    map.renderStill([&](std::exception_ptr) {
+    map.renderStill([&](std::exception_ptr err) {
+        if (err) {
+            std::rethrow_exception(err);
+        }
         result = view.readStillImage();
     });