add handle joins to test invocations so that even if they use a scene…

… that requires an importance map to be baked, that the baking process is not interrupted

Cargo.toml

@@ -13,7 +13,6 @@ rust_2021_compatibility = "warn"
 assigning_clones = "deny"
 
 [features]
-fs_isolation = []
 build_raymarch = ["sdfu/ultraviolet", "ultraviolet"]
 color_grad = ["colorgrad"]
 # for scenes with many non-dense meshes, disable sort_mesh_aabb_hits
@@ -47,7 +46,7 @@ exr = "~1.72"
 image = { version = "~0.25", features = ["hdr"] }
 # log = "~0.4"
 # log-once = "~0.4"
-lazy_static = "~1.4"
+lazy_static = "~1.5"
 math = { git = "https://github.com/gillett-hernandez/rust_cg_math", features = [
     "serde",
     "deepsize",

src/bin/color_test.rs

@@ -640,6 +640,6 @@ adjust various sliders to change the EV offset.
     let _ = eframe::run_native(
         "the same color under different illuminants",
         options,
-        Box::new(|_cc| Box::new(controller)),
+        Box::new(|_cc| Ok(Box::new(controller))),
     );
 }

src/bin/raymarch.rs

@@ -437,6 +437,9 @@ fn main() {
     let mut handles = Vec::new();
     let world = construct_world(&mut config, PathBuf::from(scene_file_path), &mut handles).unwrap();
 
+    for handle in handles {
+        let _ = handle.join();
+    }
     let camera = world.cameras[0]
         .clone()
         .with_aspect_ratio(height as f32 / width as f32);

src/parsing/mod.rs

@@ -11,7 +11,6 @@ use crate::world::World;
 
 use std::collections::HashMap;
 use std::collections::HashSet;
-use std::fs;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
@@ -222,7 +221,7 @@ pub fn construct_world<P: AsRef<Path>>(
         );
         let mut local_material_map = HashMap::new();
         assert!(
-            matches!(fs::try_exists(mesh_data.filename.as_str()), Ok(true)),
+            matches!(std::fs::try_exists(mesh_data.filename.as_str()), Ok(true)),
             "could not find obj file or mtl file {}",
             mesh_data.filename.as_str()
         );
@@ -639,6 +638,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
         println!("constructed world");
         for mat in &*world.materials {
             let name = match mat {
@@ -662,6 +664,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
     }
 
     #[test]

src/world/importance_map.rs

@@ -494,6 +494,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
 
         if let EnvironmentMap::HDR {
             importance_map,
@@ -653,6 +656,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
         let env = &world.environment;
 
         let wavelength_range = BOUNDED_VISIBLE_RANGE;
@@ -753,6 +759,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
 
         let wavelength_bounds = BOUNDED_VISIBLE_RANGE;
         if let EnvironmentMap::HDR {

src/world/mod.rs

@@ -275,6 +275,9 @@ mod test {
             &mut handles,
         )
         .unwrap();
+        for handle in handles {
+            let _ = handle.join();
+        }
 
         let ray = Ray::new(Point3::new(0.0, 0.0, 7.0), -Vec3::Z);