Fix issues with git converting CRLF to CR

UI tests now run on asmjs-unknown-emscripten, ignore tests with inline assembly which is not supported on emscripten targets
This commit is contained in:
Vadim Petrochenkov 2019-07-27 13:47:26 +03:00
parent 42a317a1cd
commit f1c8673ae7
16 changed files with 63 additions and 49 deletions

View File

@ -1 +1,2 @@
trailing-carriage-return-in-string.rs -text
lexer-crlf-line-endings-string-literal-doc-comment.rs -text
trailing-carriage-return-in-string.rs -text

View File

@ -1,3 +1,5 @@
// ignore-emscripten
#![feature(asm)]
fn main() {

View File

@ -1,5 +1,5 @@
error[E0661]: output operand constraint lacks '=' or '+'
--> $DIR/E0661.rs:5:18
--> $DIR/E0661.rs:7:18
|
LL | asm!("nop" : "r"(a));
| ^^^

View File

@ -1,3 +1,5 @@
// ignore-emscripten
#![feature(asm)]
fn main() {

View File

@ -1,5 +1,5 @@
error[E0662]: input operand constraint contains '='
--> $DIR/E0662.rs:6:12
--> $DIR/E0662.rs:8:12
|
LL | : "=test"("a")
| ^^^^^^^

View File

@ -1,3 +1,5 @@
// ignore-emscripten
#![feature(asm)]
fn main() {

View File

@ -1,5 +1,5 @@
error[E0663]: input operand constraint contains '+'
--> $DIR/E0663.rs:6:12
--> $DIR/E0663.rs:8:12
|
LL | : "+test"("a")
| ^^^^^^^

View File

@ -1,3 +1,5 @@
// ignore-emscripten
#![feature(asm)]
fn main() {

View File

@ -1,5 +1,5 @@
error[E0664]: clobber should not be surrounded by braces
--> $DIR/E0664.rs:7:12
--> $DIR/E0664.rs:9:12
|
LL | : "{eax}"
| ^^^^^^^

View File

@ -1,3 +1,5 @@
// ignore-emscripten
fn main() {
unsafe {
asm!(""); //~ ERROR inline assembly is not stable enough

View File

@ -1,5 +1,5 @@
error[E0658]: use of unstable library feature 'asm': inline assembly is not stable enough for use and is subject to change
--> $DIR/feature-gate-asm.rs:3:9
--> $DIR/feature-gate-asm.rs:5:9
|
LL | asm!("");
| ^^^

View File

@ -1,4 +1,5 @@
// gate-test-asm
// ignore-emscripten
fn main() {
unsafe {

View File

@ -1,5 +1,5 @@
error[E0658]: use of unstable library feature 'asm': inline assembly is not stable enough for use and is subject to change
--> $DIR/feature-gate-asm2.rs:5:26
--> $DIR/feature-gate-asm2.rs:6:26
|
LL | println!("{:?}", asm!(""));
| ^^^

View File

@ -1,5 +1,7 @@
// Regression test for Issue #53787: Fix ICE when creating a label in inline assembler with macros.
// ignore-emscripten
#![feature(asm)]
macro_rules! fake_jump {

View File

@ -1,5 +1,5 @@
error[E0669]: invalid value for constraint in inline assembly
--> $DIR/issue-53787-inline-assembler-macro.rs:21:16
--> $DIR/issue-53787-inline-assembler-macro.rs:23:16
|
LL | fake_jump!("FirstFunc");
| ^^^^^^^^^^^

View File

@ -1,41 +1,41 @@
// run-pass
// ignore-tidy-cr ignore-license
// ignore-tidy-cr (repeated again because of tidy bug)
// license is ignored because tidy can't handle the CRLF here properly.
// http://rust-lang.org/COPYRIGHT.
//
// N.B., this file needs CRLF line endings. The .gitattributes file in
// this directory should enforce it.
// ignore-pretty issue #37195
/// Doc comment that ends in CRLF
pub fn foo() {}
/** Block doc comment that
* contains CRLF characters
*/
pub fn bar() {}
fn main() {
let s = "string
literal";
assert_eq!(s, "string\nliteral");
let s = "literal with \
escaped newline";
assert_eq!(s, "literal with escaped newline");
let s = r"string
literal";
assert_eq!(s, "string\nliteral");
let s = br"byte string
literal";
assert_eq!(s, "byte string\nliteral".as_bytes());
// validate that our source file has CRLF endings
let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs");
assert!(source.contains("string\r\nliteral"));
}
// run-pass
// ignore-tidy-cr ignore-license
// ignore-tidy-cr (repeated again because of tidy bug)
// license is ignored because tidy can't handle the CRLF here properly.
// http://rust-lang.org/COPYRIGHT.
//
// N.B., this file needs CRLF line endings. The .gitattributes file in
// this directory should enforce it.
// ignore-pretty issue #37195
/// Doc comment that ends in CRLF
pub fn foo() {}
/** Block doc comment that
* contains CRLF characters
*/
pub fn bar() {}
fn main() {
let s = "string
literal";
assert_eq!(s, "string\nliteral");
let s = "literal with \
escaped newline";
assert_eq!(s, "literal with escaped newline");
let s = r"string
literal";
assert_eq!(s, "string\nliteral");
let s = br"byte string
literal";
assert_eq!(s, "byte string\nliteral".as_bytes());
// validate that our source file has CRLF endings
let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs");
assert!(source.contains("string\r\nliteral"));
}