Allow running framework tests on macOS 14

Author: madsmtm

crates/header-translator/src/availability.rs

@@ -339,7 +339,7 @@ impl Availability {
         if let Some(macos) = self.introduced.macos {
             // Disable test if introduced later than my current OS.
             // TODO: Use `available!` macro here.
-            if 14 < macos.x {
+            if HOST_MACOS < macos.x {
                 return false;
             }
         }
@@ -374,3 +374,10 @@ impl fmt::Display for Availability {
         Ok(())
     }
 }
+
+pub const HOST_MACOS: u32 = if option_env!("CI").is_some() {
+    9999
+} else {
+    // @madsmtm's development machine's current OS version.
+    14
+};

crates/header-translator/src/lib.rs

@@ -32,6 +32,7 @@ mod stmt;
 mod thread_safety;
 mod unexposed_attr;
 
+pub use self::availability::HOST_MACOS;
 pub use self::cfgs::PlatformCfg;
 pub use self::config::{load_config, load_skipped, Config, LibraryConfig};
 pub use self::context::{Context, MacroEntity, MacroLocation};

crates/header-translator/src/library.rs

@@ -193,6 +193,12 @@ impl Library {
         let generated_dir = crate_dir.join("src").join("generated");
         let test_path = test_crate_dir.join("tests").join(&self.data.framework);
         let emission_location = Location::from_library(&self.link_name);
+        let emit_tests = self
+            .data
+            .macos
+            .as_ref()
+            .map(|macos| macos.major <= (crate::HOST_MACOS as u64))
+            .unwrap_or(true);
 
         // Output `src/generated/*`.
         self.module.output(
@@ -201,6 +207,7 @@ impl Library {
             config,
             &emission_location,
             self.top_level_prefix(),
+            emit_tests,
         )?;
 
         if !self.data.custom_lib_rs {

crates/header-translator/src/main.rs

@@ -17,7 +17,7 @@ use tracing_tree::HierarchicalLayer;
 
 use header_translator::{
     global_analysis, load_config, load_skipped, run_cargo_fmt, Config, Context, EntryExt, Library,
-    LibraryConfig, Location, MacroEntity, MacroLocation, PlatformCfg, Stmt, VERSION,
+    LibraryConfig, Location, MacroEntity, MacroLocation, PlatformCfg, Stmt, HOST_MACOS, VERSION,
 };
 
 type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
@@ -812,6 +812,12 @@ fn update_test_metadata(workspace_dir: &Path, config: &Config) {
     // Write imports
     let mut s = String::new();
     for (_, lib) in config.to_parse() {
+        if let Some(macos) = &lib.macos {
+            if (HOST_MACOS as u64) < macos.major {
+                // Skip library if not available on current host.
+                continue;
+            }
+        }
         let platform_cfg = PlatformCfg::from_config_explicit(lib);
         if let Some(cfgs) = platform_cfg.cfgs() {
             writeln!(&mut s, "#[cfg({cfgs})]",).unwrap();

crates/header-translator/src/module.rs

@@ -249,6 +249,7 @@ impl Module {
         config: &Config,
         emission_location: &Location,
         top_level_prefix: impl fmt::Display,
+        emit_tests: bool,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         if self.submodules.is_empty() && !emission_location.is_top_level() {
             // Only output a single file
@@ -257,14 +258,18 @@ impl Module {
                 self.contents(config, emission_location, top_level_prefix)
                     .to_string(),
             )?;
-            fs::write(
-                test_path.with_extension("rs"),
-                self.tests(config).to_string(),
-            )?;
+            if emit_tests {
+                fs::write(
+                    test_path.with_extension("rs"),
+                    self.tests(config).to_string(),
+                )?;
+            }
         } else {
             // Output an entire module
             fs::create_dir_all(path)?;
-            fs::create_dir_all(test_path)?;
+            if emit_tests {
+                fs::create_dir_all(test_path)?;
+            }
 
             // TODO: Fix this
             let mut expected_files: Vec<OsString> = vec![];
@@ -278,6 +283,7 @@ impl Module {
                     config,
                     &emission_location.add_module(&name),
                     "//! This file has been automatically generated by `objc2`'s `header-translator`.\n//! DO NOT EDIT\n",
+                    emit_tests,
                 )?;
                 if module.submodules.is_empty() {
                     expected_files.push(format!("{name}.rs").into());
@@ -291,24 +297,28 @@ impl Module {
                 self.contents(config, emission_location, top_level_prefix)
                     .to_string(),
             )?;
-            fs::write(test_path.join("mod.rs"), self.tests(config).to_string())?;
+            if emit_tests {
+                fs::write(test_path.join("mod.rs"), self.tests(config).to_string())?;
+            }
             expected_files.push("mod.rs".into());
 
             // Remove previously generated files
-            for file in path.read_dir()?.chain(test_path.read_dir()?) {
-                let file = file?;
-                if expected_files.contains(&file.file_name()) {
-                    continue;
-                }
-                error!("removing previous file {:?}", file.path());
-                if file.path().is_dir() {
-                    fs::remove_dir_all(file.path())?;
-                } else {
-                    fs::remove_file(file.path())?;
+            if let Ok(test_dir) = test_path.read_dir() {
+                for file in path.read_dir()?.chain(test_dir) {
+                    let file = file?;
+                    if expected_files.contains(&file.file_name()) {
+                        continue;
+                    }
+                    error!("removing previous file {:?}", file.path());
+                    if file.path().is_dir() {
+                        fs::remove_dir_all(file.path())?;
+                    } else {
+                        fs::remove_file(file.path())?;
+                    }
                 }
             }
 
-            if emission_location.is_top_level() {
+            if emission_location.is_top_level() && emit_tests {
                 let data = config.library(emission_location);
                 let mut s = String::new();
                 writeln!(&mut s, "#![cfg(feature = \"test-frameworks\")]")?;

crates/header-translator/src/stmt.rs

@@ -3219,6 +3219,11 @@ impl Stmt {
             _ => return None,
         };
 
+        // Availability is broken in MDLUtility.h for some reason?
+        if cls.name == "MDLUtility" {
+            return None;
+        }
+
         Some(FormatterFn(move |f| {
             write!(
                 f,
@@ -3278,6 +3283,17 @@ impl Stmt {
                 if ["Dispatch"].contains(&id.library_name()) {
                     return None;
                 }
+                // Some statics are missing / have wrong availability attributes.
+                if [
+                    "CBUUIDCharacteristicObservationScheduleString",
+                    "kMDItemXMPCredit",
+                    "kMDItemXMPDigitalSourceType",
+                    "HKDataTypeIdentifierStateOfMind",
+                ]
+                .contains(&&*id.name)
+                {
+                    return None;
+                }
                 if !availability.is_available_host() {
                     return None;
                 }