Merge pull request #53 from alexcrichton/fix-beta

Fix tests on beta
BurntSushi · Dec 30, 2016 · a9a7163 · a9a7163
2 parents 5ec4fff + 7a48317
commit a9a7163
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tests/workdir.rs b/tests/workdir.rs
@@ -25,10 +25,13 @@ pub struct Workdir {
 impl Workdir {
     pub fn new(name: &str) -> Workdir {
         let id = NEXT_ID.fetch_add(1, atomic::Ordering::SeqCst);
-        let root = env::current_exe().unwrap()
-                       .parent()
-                       .expect("executable's directory")
-                       .to_path_buf();
+        let mut root = env::current_exe().unwrap()
+                           .parent()
+                           .expect("executable's directory")
+                           .to_path_buf();
+        if root.ends_with("deps") {
+            root.pop();
+        }
         let dir = root.join(XSV_INTEGRATION_TEST_DIR)
                       .join(name)
                       .join(&format!("test-{}", id));