Fix micro_rpc cross workspace dependency

Add a manual test to check regressions in the future. Ref project-oak#4573
tiziano88 · Jan 2, 2024 · 8aecca7 · 8aecca7
1 parent 38d4d58
commit 8aecca7
Show file tree

Hide file tree

Showing 7 changed files with 483 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,6 +61,7 @@ members = [
 exclude = [
   "fuzz",
   "enclave_applications",
+  "micro_rpc_workspace_test",
   "oak_functions/loader/fuzz",
   "oak_restricted_kernel_bin",
   "oak_restricted_kernel_wrapper",

diff --git a/micro_rpc/build.rs b/micro_rpc/build.rs
@@ -16,11 +16,8 @@
 
 fn main() {
     micro_rpc_build::compile(
-        &[format!(
-            "{}proto/micro_rpc/messages.proto",
-            env!("WORKSPACE_ROOT")
-        )],
-        &[env!("WORKSPACE_ROOT")],
+        &["../proto/micro_rpc/messages.proto"],
+        &["../proto"],
         Default::default(),
     );
 }
diff --git a/micro_rpc_workspace_test/.cargo/config.toml b/micro_rpc_workspace_test/.cargo/config.toml
@@ -0,0 +1,2 @@
+[env]
+WORKSPACE_ROOT = { value = "_INVALID_WORKSPACE_ROOT_" }