Skip to content

Commit de332a7

Browse files
jieyouxujieyouxu
committed
tests: rebless some tests as a side-effect of TEST_BUILD_DIR changes
1 parent 75a34d2 commit de332a7

8 files changed

+16
-16
lines changed

Diff for: ‎tests/ui/crate-loading/crateresolve1.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
44
LL | extern crate crateresolve1;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.somelib
8-
= note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.somelib
9-
= note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.somelib
7+
= note: candidate #1: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-1.somelib
8+
= note: candidate #2: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-2.somelib
9+
= note: candidate #3: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-3.somelib
1010

1111
error: aborting due to 1 previous error
1212

Diff for: ‎tests/ui/crate-loading/crateresolve2.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rmeta` dependency `crateresolve2` found
44
LL | extern crate crateresolve2;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: candidate #1: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-1.rmeta
8-
= note: candidate #2: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-2.rmeta
9-
= note: candidate #3: $TEST_BUILD_DIR/crate-loading/crateresolve2/auxiliary/libcrateresolve2-3.rmeta
7+
= note: candidate #1: $TEST_BUILD_DIR/auxiliary/libcrateresolve2-1.rmeta
8+
= note: candidate #2: $TEST_BUILD_DIR/auxiliary/libcrateresolve2-2.rmeta
9+
= note: candidate #3: $TEST_BUILD_DIR/auxiliary/libcrateresolve2-3.rmeta
1010

1111
error: aborting due to 1 previous error
1212

Diff for: ‎tests/ui/error-codes/E0462.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | extern crate found_staticlib;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: the following crate versions were found:
8-
crate `found_staticlib`: $TEST_BUILD_DIR/error-codes/E0462/auxiliary/libfound_staticlib.somelib
8+
crate `found_staticlib`: $TEST_BUILD_DIR/auxiliary/libfound_staticlib.somelib
99
= help: please recompile that crate using --crate-type lib
1010

1111
error: aborting due to 1 previous error

Diff for: ‎tests/ui/error-codes/E0464.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
44
LL | extern crate crateresolve1;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
8-
= note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
9-
= note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
7+
= note: candidate #1: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-1.somelib
8+
= note: candidate #2: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-2.somelib
9+
= note: candidate #3: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-3.somelib
1010

1111
error: aborting due to 1 previous error
1212

Diff for: ‎tests/ui/error-codes/E0523.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
44
LL | extern crate crateresolve1;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: candidate #1: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-1.somelib
8-
= note: candidate #2: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-2.somelib
9-
= note: candidate #3: $TEST_BUILD_DIR/error-codes/E0523/auxiliary/libcrateresolve1-3.somelib
7+
= note: candidate #1: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-1.somelib
8+
= note: candidate #2: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-2.somelib
9+
= note: candidate #3: $TEST_BUILD_DIR/auxiliary/libcrateresolve1-3.somelib
1010

1111
error: aborting due to 1 previous error
1212

Diff for: ‎tests/ui/json/json-multiple.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/json/json-multiple/libjson_multiple.rlib","emit":"link"}
1+
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/libjson_multiple.rlib","emit":"link"}

Diff for: ‎tests/ui/json/json-options.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/json/json-options/libjson_options.rlib","emit":"link"}
1+
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/libjson_options.rlib","emit":"link"}

Diff for: ‎tests/ui/rmeta/emit-artifact-notifications.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications/libemit_artifact_notifications.rmeta","emit":"metadata"}
1+
{"$message_type":"artifact","artifact":"$TEST_BUILD_DIR/libemit_artifact_notifications.rmeta","emit":"metadata"}

0 commit comments

Comments
 (0)