Normalize crateresolve1.rs to support different candidate ordering between executions.

diff --git a/src/test/ui/crateresolve1.nll.stderr b/src/test/ui/crateresolve1.nll.stderr
index fb5321eebf8bb8275ca8bdeb682d63d6ff96ca57..acaf7c1db219fbf7fa02e60b10d8c8af849ed78b 100644 (file)
--- a/src/test/ui/crateresolve1.nll.stderr
+++ b/src/test/ui/crateresolve1.nll.stderr
@@ -1,16 +1,16 @@
 error[E0464]: multiple matching crates for `crateresolve1`
-  --> $DIR/crateresolve1.rs:16:1
+  --> $DIR/crateresolve1.rs:18:1
    |
 LL | extern crate crateresolve1;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: candidates:
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-1.so
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-2.so
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-3.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1.nll/auxiliary/libcrateresolve1-N.so
 
 error[E0463]: can't find crate for `crateresolve1`
-  --> $DIR/crateresolve1.rs:16:1
+  --> $DIR/crateresolve1.rs:18:1
    |
 LL | extern crate crateresolve1;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate

diff --git a/src/test/ui/crateresolve1.rs b/src/test/ui/crateresolve1.rs
index 8c3dbda68020128c12036867b328b50b97c02f4e..51af8124512933842b5e89d9f8f40d4ee4b6b45a 100644 (file)
--- a/src/test/ui/crateresolve1.rs
+++ b/src/test/ui/crateresolve1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test: "crateresolve1\-\d.so" -> "crateresolve1-N.so"
+
 // aux-build:crateresolve1-1.rs
 // aux-build:crateresolve1-2.rs
 // aux-build:crateresolve1-3.rs

diff --git a/src/test/ui/crateresolve1.stderr b/src/test/ui/crateresolve1.stderr
index a1105475d097da598e62186e6505f3ce3e294fc1..babcf6260e1d65730f54e8b001a2f9e8977d1797 100644 (file)
--- a/src/test/ui/crateresolve1.stderr
+++ b/src/test/ui/crateresolve1.stderr
@@ -1,16 +1,16 @@
 error[E0464]: multiple matching crates for `crateresolve1`
-  --> $DIR/crateresolve1.rs:16:1
+  --> $DIR/crateresolve1.rs:18:1
    |
 LL | extern crate crateresolve1;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: candidates:
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-1.so
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-2.so
-           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-3.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so
+           crate `crateresolve1`: $TEST_BUILD_DIR/crateresolve1/auxiliary/libcrateresolve1-N.so
 
 error[E0463]: can't find crate for `crateresolve1`
-  --> $DIR/crateresolve1.rs:16:1
+  --> $DIR/crateresolve1.rs:18:1
    |
 LL | extern crate crateresolve1;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate