From 26353eae4c1454cad27e4af26c664c0048312668 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 8 Jul 2020 08:52:48 -0700
Subject: [PATCH 1/2] Fix x.py test for librustc crates.

---
 src/bootstrap/test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 312532558090e..1916d96bed71d 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1562,7 +1562,7 @@ impl Step for CrateLibrustc {
         let compiler = builder.compiler(builder.top_stage, run.host);
 
         for krate in builder.in_tree_crates("rustc-main") {
-            if run.path.ends_with(&krate.path) {
+            if krate.path.ends_with(&run.path) {
                 let test_kind = builder.kind.into();
 
                 builder.ensure(CrateLibrustc {
@@ -1669,7 +1669,7 @@ impl Step for Crate {
         };
 
         for krate in builder.in_tree_crates("test") {
-            if run.path.ends_with(&krate.local_path(&builder)) {
+            if krate.path.ends_with(&run.path) {
                 make(Mode::Std, krate);
             }
         }

From 723872639995246b586473867ded975465e1466f Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 8 Jul 2020 10:44:29 -0700
Subject: [PATCH 2/2] Fix librustc_errors unit tests.

---
 src/librustc_errors/json/tests.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/librustc_errors/json/tests.rs b/src/librustc_errors/json/tests.rs
index 35912901d688a..a2ed6ad6f3501 100644
--- a/src/librustc_errors/json/tests.rs
+++ b/src/librustc_errors/json/tests.rs
@@ -59,6 +59,7 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) {
             sm,
             true,
             HumanReadableErrorType::Short(ColorConfig::Never),
+            None,
             false,
         );