From: Eric Huss <eric@huss.org>
Date: Tue, 15 May 2018 14:52:24 +0000 (-0700)
Subject: Fix tests when CARGO_TARGET_DIR is set.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~30^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7318014fb116192a9ca6b86c3606ddf7e3f3536a;p=cargo.git

Fix tests when CARGO_TARGET_DIR is set.

Fixes #5536
---

diff --git a/tests/testsuite/build_plan.rs b/tests/testsuite/build_plan.rs
index d11eef122..87620aa77 100644
--- a/tests/testsuite/build_plan.rs
+++ b/tests/testsuite/build_plan.rs
@@ -23,7 +23,7 @@ fn cargo_build_plan_simple() {
         "invocations": [
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [],
                 "env": "{...}",
                 "kind": "Host",
@@ -93,7 +93,7 @@ fn cargo_build_plan_single_dep() {
         "invocations": [
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [],
                 "env": "{...}",
                 "kind": "Host",
@@ -108,7 +108,7 @@ fn cargo_build_plan_single_dep() {
             },
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [0],
                 "env": "{...}",
                 "kind": "Host",
@@ -160,7 +160,7 @@ fn cargo_build_plan_build_script() {
         "invocations": [
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [],
                 "env": "{...}",
                 "kind": "Host",
@@ -175,7 +175,7 @@ fn cargo_build_plan_build_script() {
             },
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [0],
                 "env": "{...}",
                 "kind": "Host",
@@ -188,7 +188,7 @@ fn cargo_build_plan_build_script() {
             },
             {
                 "args": "{...}",
-                "cwd": "[..][/]target[/]cit[/][..][/]foo",
+                "cwd": "[..][/]cit[/][..][/]foo",
                 "deps": [1],
                 "env": "{...}",
                 "kind": "Host",