Dynamically obtain current version

intel · Dec 10, 2023 · be45c18 · be45c18
1 parent b20245c
commit be45c18
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/examples/tests/x86_64-uefi/test-manual-max.py b/examples/tests/x86_64-uefi/test-manual-max.py
@@ -7,7 +7,7 @@
 simics.SIM_set_log_level(tsffs, 4)
 tsffs.iface.tsffs.set_start_on_harness(False)
 tsffs.iface.tsffs.set_stop_on_harness(False)
-tsffs.iface.tsffs.set_timeout(0.0001)
+tsffs.iface.tsffs.set_timeout(3.0)
 tsffs.iface.tsffs.add_exception_solution(14)
 tsffs.iface.tsffs.set_generate_random_corpus(True)
 tsffs.iface.tsffs.set_iterations(1000)

diff --git a/modules/tsffs/tests/Cargo.toml b/modules/tsffs/tests/Cargo.toml
@@ -16,6 +16,7 @@ version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+cargo_metadata = "0.18.1"
 command-ext.workspace = true
 getters.workspace = true
 indoc = "2.0.4"
@@ -29,4 +30,4 @@ walkdir = "2.4.0"
 anyhow.workspace = true
 command-ext.workspace = true
 simics-codegen.workspace = true
-ispm-wrapper.workspace = true
+ispm-wrapper.workspace = true
diff --git a/modules/tsffs/tests/src/lib.rs b/modules/tsffs/tests/src/lib.rs
@@ -4,6 +4,7 @@
 //! SIMICS test utilities for test environment setup and configuration
 
 use anyhow::{anyhow, bail, ensure, Result};
+use cargo_metadata::MetadataCommand;
 use getters::Getters;
 use ispm_wrapper::{
     data::ProjectPackage,
@@ -225,6 +226,15 @@ impl TestEnv {
 }
 
 impl TestEnv {
+    fn current_tsffs_version() -> Result<String> {
+        let metadata = MetadataCommand::new().exec()?;
+        metadata
+            .workspace_metadata
+            .get("version")
+            .and_then(|v| v.as_str())
+            .map(|v| v.to_string())
+            .ok_or_else(|| anyhow!("No 'version' in workspace metadata"))
+    }
     fn install_tsffs<P, S>(simics_home_dir: P, cargo_manifest_dir: S) -> Result<()>
     where
         P: AsRef<Path>,
@@ -253,7 +263,10 @@ impl TestEnv {
                     .join("../../../")
                     .join("linux64")
                     .join("packages")
-                    .join("simics-pkg-31337-6.0.1-linux64.ispm")])
+                    .join(format!(
+                        "simics-pkg-31337-{}-linux64.ispm",
+                        Self::current_tsffs_version()?
+                    ))])
                 .global(
                     GlobalOptions::builder()
                         .install_dir(simics_home_dir.as_ref())