diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2021-10-05 20:23:40 -0700 |
|---|---|---|
| committer | Noah Lev <camelidcamel@gmail.com> | 2021-10-12 13:10:10 -0700 |
| commit | 642a43a9cd729bf2a7d20d34216cfee02c1c1e33 (patch) | |
| tree | 09ea3937b95ebe03d79ed8d32b841070d419ad7b | |
| parent | 6792c6a8510640dcdf7b6e82dc9c35d39dbf4226 (diff) | |
| download | rust-642a43a9cd729bf2a7d20d34216cfee02c1c1e33.tar.gz rust-642a43a9cd729bf2a7d20d34216cfee02c1c1e33.zip | |
Test crate loading error stderr
And remove E0464 from test-exemption list, since it now has a full test.
| -rw-r--r-- | src/test/ui/crate-loading/crateresolve1.rs | 7 | ||||
| -rw-r--r-- | src/test/ui/crate-loading/crateresolve1.stderr | 13 | ||||
| -rw-r--r-- | src/tools/tidy/src/error_codes_check.rs | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/test/ui/crate-loading/crateresolve1.rs b/src/test/ui/crate-loading/crateresolve1.rs index 49e47dacc3d..8e01862746f 100644 --- a/src/test/ui/crate-loading/crateresolve1.rs +++ b/src/test/ui/crate-loading/crateresolve1.rs @@ -1,10 +1,13 @@ -// dont-check-compiler-stderr // aux-build:crateresolve1-1.rs // aux-build:crateresolve1-2.rs // aux-build:crateresolve1-3.rs -// error-pattern:multiple matching crates for `crateresolve1` + +// normalize-stderr-test: "\.nll/" -> "/" +// normalize-stderr-test: "\\\?\\" -> "" +// normalize-stderr-test: "libcrateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$1.somelib" extern crate crateresolve1; +//~^ ERROR multiple matching crates for `crateresolve1` fn main() { } diff --git a/src/test/ui/crate-loading/crateresolve1.stderr b/src/test/ui/crate-loading/crateresolve1.stderr new file mode 100644 index 00000000000..1cae13922d6 --- /dev/null +++ b/src/test/ui/crate-loading/crateresolve1.stderr @@ -0,0 +1,13 @@ +error[E0464]: multiple matching crates for `crateresolve1` + --> $DIR/crateresolve1.rs:9:1 + | +LL | extern crate crateresolve1; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = note: candidates: + crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.somelib + crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.somelib + crate `crateresolve1`: $TEST_BUILD_DIR/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.somelib + +error: aborting due to previous error + diff --git a/src/tools/tidy/src/error_codes_check.rs b/src/tools/tidy/src/error_codes_check.rs index ce169867b7b..6d802cdcd03 100644 --- a/src/tools/tidy/src/error_codes_check.rs +++ b/src/tools/tidy/src/error_codes_check.rs @@ -10,8 +10,8 @@ use regex::Regex; // A few of those error codes can't be tested but all the others can and *should* be tested! const EXEMPTED_FROM_TEST: &[&str] = &[ - "E0227", "E0279", "E0280", "E0313", "E0377", "E0461", "E0462", "E0464", "E0465", "E0476", - "E0514", "E0519", "E0523", "E0554", "E0640", "E0717", "E0729", + "E0227", "E0279", "E0280", "E0313", "E0377", "E0461", "E0462", "E0465", "E0476", "E0514", + "E0519", "E0523", "E0554", "E0640", "E0717", "E0729", ]; // Some error codes don't have any tests apparently... |