Account for beta revisions when normalizing versions
Several UI tests have a `normalize-stderr` for "you are using x.y.z" rustc versions, and that regex is flexible enough for suffixes like "-nightly" and "-dev", but not for "-beta.N". We can just add '.' to that trailing pattern to include this.
This commit is contained in:
parent
706f244db5
commit
8469966710
8 changed files with 8 additions and 8 deletions
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![deny(warnings)]
|
||||
#![feature(no_stack_check)]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![crate_type = "lib"]
|
||||
#![feature(no_coverage)] //~ ERROR feature has been removed [E0557]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
#![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
|
||||
//~^ ERROR malformed `feature`
|
||||
//~| ERROR malformed `feature`
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![feature(external_doc)] //~ ERROR feature has been removed
|
||||
#![doc(include("README.md"))] //~ ERROR unknown `doc` attribute `include`
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//@ aux-build:two_macros.rs
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![feature(macro_reexport)] //~ ERROR feature has been removed
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![feature(doc_keyword)] //~ ERROR
|
||||
#![feature(doc_primitive)] //~ ERROR
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
// Regression test for issue #125877.
|
||||
|
||||
//@ compile-flags: -Znext-solver
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![feature(const_trait_impl, effects)]
|
||||
//~^ ERROR feature has been removed
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
//@ normalize-stderr: "you are using [0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?( \([^)]*\))?" -> "you are using $$RUSTC_VERSION"
|
||||
|
||||
#![feature(unsized_locals)] //~ERROR feature has been removed
|
||||
#![crate_type = "lib"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue