Making sure that the test feature is exercised correctly in the rust …

…agent build

Signed-off-by: George Almasi <[email protected]>

keylime-agent/src/main.rs

@@ -133,21 +133,21 @@ async fn main() -> Result<()> {
     let mut config = config::KeylimeConfig::new()?;
 
     // load path for IMA logfile
-    // To fix later: GA 10/1/23: IMA and MBA log path override mechanisms are different
-    let mut ima_ml_path;
-    cfg_if::cfg_if! {
-        if #[cfg(test)] {
+    #[cfg(test)]
+    fn ima_ml_path_get(_: &String) -> PathBuf {
+        Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("test-data")
+            .join("ima")
+            .join("ascii_runtime_measurements")
+    }
 
-            let p = Path::new(env!("CARGO_MANIFEST_DIR"))
-                .join("test-data")
-                .join("ima")
-                .join("ascii_runtime_measurements");
-            ima_ml_path = p.as_path();
-        } else {
-            ima_ml_path = Path::new(&config.agent.ima_ml_path);
-        }
+    #[cfg(not(test))]
+    fn ima_ml_path_get(s: &String) -> PathBuf {
+        Path::new(&s).to_path_buf()
     }
 
+    let ima_ml_path = ima_ml_path_get(&config.agent.ima_ml_path);
+
     // check whether anyone has overridden the default
     if ima_ml_path.as_os_str() != config::DEFAULT_IMA_ML_PATH {
         warn!(
@@ -158,7 +158,7 @@ async fn main() -> Result<()> {
 
     // check IMA logfile exists & accessible
     let ima_ml_file = if ima_ml_path.exists() {
-        match fs::File::open(ima_ml_path) {
+        match fs::File::open(&ima_ml_path) {
             Ok(file) => Some(Mutex::new(file)),
             Err(e) => {
                 warn!(