fix macos tests

Author: ciscorn

.github/workflows/ci.yml

@@ -106,8 +106,8 @@ jobs:
           # macOS ARM
           - runs-on: macos-latest
             backend: metal
-            precompiled: 1
-            amalgam: 1
+            precompiled: 0
+            amalgam: 0
           - runs-on: macos-latest
             backend: vulkan
             precompiled: 0

build.rs

@@ -35,7 +35,9 @@ const MLN_COMMIT: &str = "35cf39b72f45cfea55a34ffe7358ade5c950a3c5";
 const BRIDGE_RS: &str = "src/bridge.rs";
 const BRIDGE_CPP_DIR: &str = "src/cpp";
 
-const BRIDGE_INCLUDE_DIRS: &[&str] = &["include", "src/cpp"];
+const BRIDGE_INCLUDE_DIRS: &[&str] = &["src/cpp"];
+
+const PRECOMPILED_VENDORED_INCLUDE_DIR: &str = "include";
 
 /// Supported graphics rendering APIs.
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
@@ -317,7 +319,14 @@ struct Info {
 }
 
 fn bundle_precompiled() -> Info {
-    let (cpp_root, include_dirs) = resolve_mln_core();
+    let (cpp_root, mut include_dirs) = resolve_mln_core();
+
+    // The precompiled headers tarball omits `platform/default/` headers
+    // (e.g. `mbgl/gfx/headless_frontend.hpp`), so add vendored fallbacks.
+    let root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+    include_dirs.push(root.join(PRECOMPILED_VENDORED_INCLUDE_DIR));
+    // Editing a vendored fallback header must trigger a rebuild of the bridge.
+    println!("cargo:rerun-if-changed={PRECOMPILED_VENDORED_INCLUDE_DIR}");
 
     println!(
         "cargo:warning=Using precompiled maplibre-native static library from {}",

src/cpp/geojson/geojson.cpp

@@ -18,7 +18,7 @@ std::unique_ptr<GeoJson> parse(rust::Str json) {
     mbgl::style::conversion::Error error;
     auto geojson = mbgl::style::conversion::parseGeoJSON(std::string(json), error);
     if (!geojson) {
-        throw std::runtime_error(error.message);
+        throw std::runtime_error(error.message.empty() ? "failed to parse GeoJSON" : error.message);
     }
     return std::make_unique<GeoJson>(std::move(*geojson));
 }

src/style/geojson.rs

@@ -100,12 +100,14 @@ mod tests {
     use super::GeoJson;
 
     #[test]
-    fn parse_and_clone_geojson() {
-        let geojson = r#"{"type":"Point","coordinates":[1.0,2.0]}"#
-            .parse::<GeoJson>()
-            .expect("valid point GeoJSON should parse");
+    fn clone_survives_original_drop() {
+        let cloned = {
+            let geojson = r#"{"type":"Point","coordinates":[1.0,2.0]}"#
+                .parse::<GeoJson>()
+                .expect("valid point GeoJSON should parse");
+            geojson.clone()
+        };
 
-        let cloned = geojson.clone();
         let _ = cloned.as_inner();
     }
 

tests/image_renderer.rs

@@ -88,11 +88,10 @@ fn multiple_renderers_render_on_single_thread() {
     let second_request =
         second.submit_render_static(&test_camera()).expect("second render should submit");
 
-    // Both requests are driven from the same thread-local run loop.
-    tick_until_ready(|| first_request.is_ready() && second_request.is_ready());
-
-    let first_image = first_request.finish().expect("first renderer should render");
-    let second_image = second_request.finish().expect("second renderer should render");
+    // Both requests are already submitted before waiting, so they are driven
+    // from the same thread-local run loop.
+    let first_image = first_request.wait().expect("first renderer should render");
+    let second_image = second_request.wait().expect("second renderer should render");
 
     assert_eq!(first_image.as_image().width(), 128);
     assert_eq!(first_image.as_image().height(), 128);
@@ -108,9 +107,8 @@ fn load_style_from_json_str_renders() {
 
     let request =
         renderer.submit_render_static(&test_camera()).expect("JSON style render should submit");
-    tick_until_ready(|| request.is_ready());
 
-    let image = request.finish().expect("JSON style should render");
+    let image = request.wait().expect("JSON style should render");
     assert_eq!(image.as_image().width(), 128);
     assert_eq!(image.as_image().height(), 128);
 }
@@ -150,9 +148,7 @@ fn tile_render_request_renders() {
 
     let request = renderer.submit_render_tile(0, 0, 0).expect("tile render should submit");
 
-    tick_until_ready(|| request.is_ready());
-
-    let image = request.finish().expect("tile renderer should render");
+    let image = request.wait().expect("tile renderer should render");
     assert_eq!(image.as_image().width(), 128);
     assert_eq!(image.as_image().height(), 128);
 }
@@ -171,9 +167,8 @@ fn camera_for_bounds_renders() {
     };
     let camera = renderer.camera_for_bounds(bounds, Some(EdgeInsets::all(8.0)), 0.0, 0.0);
     let request = renderer.submit_render_static(&camera).expect("bounds-fit render should submit");
-    tick_until_ready(|| request.is_ready());
 
-    let image = request.finish().expect("bounds-fit renderer should render");
+    let image = request.wait().expect("bounds-fit renderer should render");
     assert_eq!(image.as_image().width(), 128);
     assert_eq!(image.as_image().height(), 128);
 }
@@ -197,9 +192,8 @@ fn camera_for_lat_lngs_renders() {
         .expect("non-empty coordinates should produce a camera");
     let request =
         renderer.submit_render_static(&camera).expect("coordinates-fit render should submit");
-    tick_until_ready(|| request.is_ready());
 
-    let image = request.finish().expect("coordinates-fit renderer should render");
+    let image = request.wait().expect("coordinates-fit renderer should render");
     assert_eq!(image.as_image().width(), 128);
     assert_eq!(image.as_image().height(), 128);
 }
@@ -234,9 +228,8 @@ fn camera_for_geojson_renders() {
         .expect("non-empty geometry should produce a camera");
     let request =
         renderer.submit_render_static(&camera).expect("geometry-fit render should submit");
-    tick_until_ready(|| request.is_ready());
 
-    let image = request.finish().expect("geometry-fit renderer should render");
+    let image = request.wait().expect("geometry-fit renderer should render");
     assert_eq!(image.as_image().width(), 128);
     assert_eq!(image.as_image().height(), 128);
 }
@@ -282,8 +275,7 @@ fn camera_for_geojson_matches_bounds() {
 
     let render = |renderer: &mut ImageRenderer<Static>, camera: &CameraUpdate| {
         let request = renderer.submit_render_static(camera).expect("render should submit");
-        tick_until_ready(|| request.is_ready());
-        request.finish().expect("render should succeed").as_image().clone()
+        request.wait().expect("render should succeed").as_image().clone()
     };
 
     let geo_camera = renderer