From edefbf7c73f7bb3c88d3e055a42a04f68e1a64a0 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Fri, 28 Aug 2020 15:58:16 -0700
Subject: [PATCH] fix tests

---
 crates/wiggle/tests/arrays.rs   | 2 +-
 crates/wiggle/tests/atoms.rs    | 2 +-
 crates/wiggle/tests/flags.rs    | 2 +-
 crates/wiggle/tests/handles.rs  | 2 +-
 crates/wiggle/tests/ints.rs     | 2 +-
 crates/wiggle/tests/keywords.rs | 2 +-
 crates/wiggle/tests/pointers.rs | 2 +-
 crates/wiggle/tests/strings.rs  | 2 +-
 crates/wiggle/tests/structs.rs  | 2 +-
 crates/wiggle/tests/union.rs    | 2 +-
 crates/wiggle/tests/wasi.rs     | 5 +++--
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/crates/wiggle/tests/arrays.rs b/crates/wiggle/tests/arrays.rs
index 9142e9f01e..9bfad46e7b 100644
--- a/crates/wiggle/tests/arrays.rs
+++ b/crates/wiggle/tests/arrays.rs
@@ -3,7 +3,7 @@ use wiggle::{GuestMemory, GuestPtr};
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/arrays.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/arrays.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/atoms.rs b/crates/wiggle/tests/atoms.rs
index 5407828fa9..b83468678b 100644
--- a/crates/wiggle/tests/atoms.rs
+++ b/crates/wiggle/tests/atoms.rs
@@ -3,7 +3,7 @@ use wiggle::GuestMemory;
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/atoms.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/atoms.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/flags.rs b/crates/wiggle/tests/flags.rs
index fcb07e7a7d..bca0a27bae 100644
--- a/crates/wiggle/tests/flags.rs
+++ b/crates/wiggle/tests/flags.rs
@@ -4,7 +4,7 @@ use wiggle::{GuestMemory, GuestPtr};
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/flags.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/flags.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/handles.rs b/crates/wiggle/tests/handles.rs
index 93e3b54d18..cb441a910c 100644
--- a/crates/wiggle/tests/handles.rs
+++ b/crates/wiggle/tests/handles.rs
@@ -5,7 +5,7 @@ use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 const FD_VAL: u32 = 123;
 
 wiggle::from_witx!({
-    witx: ["tests/handles.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/handles.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/ints.rs b/crates/wiggle/tests/ints.rs
index 36d7933e62..a3d15c79d8 100644
--- a/crates/wiggle/tests/ints.rs
+++ b/crates/wiggle/tests/ints.rs
@@ -4,7 +4,7 @@ use wiggle::GuestMemory;
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/ints.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/ints.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/keywords.rs b/crates/wiggle/tests/keywords.rs
index ea002fcc6d..bc1ee4edce 100644
--- a/crates/wiggle/tests/keywords.rs
+++ b/crates/wiggle/tests/keywords.rs
@@ -58,7 +58,7 @@ mod struct_test {
 /// Test that a union variant that conflicts with a Rust keyword can be compiled properly.
 mod union_test {
     wiggle::from_witx!({
-        witx: ["tests/keywords_union.witx"],
+        witx: ["$CARGO_MANIFEST_DIR/tests/keywords_union.witx"],
         ctx: DummyCtx,
     });
 }
diff --git a/crates/wiggle/tests/pointers.rs b/crates/wiggle/tests/pointers.rs
index c39988d115..28ef3d107d 100644
--- a/crates/wiggle/tests/pointers.rs
+++ b/crates/wiggle/tests/pointers.rs
@@ -3,7 +3,7 @@ use wiggle::{GuestMemory, GuestPtr};
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/pointers.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/pointers.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/strings.rs b/crates/wiggle/tests/strings.rs
index 3546fd1276..e68a569ed6 100644
--- a/crates/wiggle/tests/strings.rs
+++ b/crates/wiggle/tests/strings.rs
@@ -3,7 +3,7 @@ use wiggle::{GuestMemory, GuestPtr};
 use wiggle_test::{impl_errno, HostMemory, MemArea, MemAreas, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/strings.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/strings.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/structs.rs b/crates/wiggle/tests/structs.rs
index f342d4487a..ad2e43a2db 100644
--- a/crates/wiggle/tests/structs.rs
+++ b/crates/wiggle/tests/structs.rs
@@ -3,7 +3,7 @@ use wiggle::{GuestMemory, GuestPtr};
 use wiggle_test::{impl_errno, HostMemory, MemArea, MemAreas, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/structs.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/structs.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/union.rs b/crates/wiggle/tests/union.rs
index ab3dada99c..9763e488dd 100644
--- a/crates/wiggle/tests/union.rs
+++ b/crates/wiggle/tests/union.rs
@@ -3,7 +3,7 @@ use wiggle::{GuestMemory, GuestType};
 use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
 
 wiggle::from_witx!({
-    witx: ["tests/union.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/union.witx"],
     ctx: WasiCtx,
 });
 
diff --git a/crates/wiggle/tests/wasi.rs b/crates/wiggle/tests/wasi.rs
index 8847959aa2..45e2b7d1ba 100644
--- a/crates/wiggle/tests/wasi.rs
+++ b/crates/wiggle/tests/wasi.rs
@@ -7,7 +7,7 @@ use wiggle_test::WasiCtx;
 // witx is exposed with the type signatures that we expect.
 
 wiggle::from_witx!({
-    witx: ["tests/wasi.witx"],
+    witx: ["$CARGO_MANIFEST_DIR/tests/wasi.witx"],
     ctx: WasiCtx,
 });
 
@@ -16,7 +16,8 @@ wiggle::from_witx!({
 #[test]
 fn document_equivalent() {
     let macro_doc = metadata::document();
-    let disk_doc = witx::load(&["tests/wasi.witx"]).expect("load wasi.witx from disk");
+    let disk_doc =
+        witx::load(&["$CARGO_MANIFEST_DIR/tests/wasi.witx"]).expect("load wasi.witx from disk");
 
     assert_eq!(macro_doc, disk_doc);
 }