first pass of merging in warp (doesn't build)

crates/integration/src/builder.rs

@@ -1,15 +1,16 @@
-use crate::util::{set_zsh_histfile_location, write_rc_files_for_test, ShellRcType};
-use galaxyui::integration::{self, PersistedDataMap, TestStep};
-use galaxyui::integration::{TestDriver, TestSetupUtils};
-use galaxyui::{App, WindowId};
-use galaxyui_extras::user_preferences::file_backed::FileBackedUserPreferences;
-use galaxyui_extras::user_preferences::UserPreferences;
 use std::collections::HashMap;
 use std::future::Future;
 use std::path::PathBuf;
 use std::pin::Pin;
 use std::time::Duration;
 
+use galaxyui_core::integration::{self, PersistedDataMap, TestDriver, TestSetupUtils, TestStep};
+use galaxyui_core::{App, WindowId};
+use galaxyui_extras::user_preferences::file_backed::FileBackedUserPreferences;
+use galaxyui_extras::user_preferences::UserPreferences;
+
+use crate::util::{set_zsh_histfile_location, write_rc_files_for_test, ShellRcType};
+
 // We have logic in our build script to pass the path of the cargo target
 // tmp directory to our app. This needs to be done as a build script because
 // the relevant env var is only available at build time to ensure things like
@@ -185,7 +186,7 @@ impl Builder {
             // printed out during shell initialization telling the user how to
             // use `sudo`. This can interfere with tests that make assertions
             // about the block list, so suppress the message.
-            #[cfg(target_os = "linux")]
+            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
             std::fs::File::create(dir.join(".sudo_as_admin_successful"))
                 .expect("should not fail to create file in home directory");