Skip to content

Commit f1c8673

Browse files
committed
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
1 parent 42a317a commit f1c8673

16 files changed

+63
-49
lines changed

src/test/ui/.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
trailing-carriage-return-in-string.rs -text
1+
lexer-crlf-line-endings-string-literal-doc-comment.rs -text
2+
trailing-carriage-return-in-string.rs -text

src/test/ui/error-codes/E0661.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-emscripten
2+
13
#![feature(asm)]
24

35
fn main() {

src/test/ui/error-codes/E0661.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0661]: output operand constraint lacks '=' or '+'
2-
--> $DIR/E0661.rs:5:18
2+
--> $DIR/E0661.rs:7:18
33
|
44
LL | asm!("nop" : "r"(a));
55
| ^^^

src/test/ui/error-codes/E0662.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-emscripten
2+
13
#![feature(asm)]
24

35
fn main() {

src/test/ui/error-codes/E0662.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0662]: input operand constraint contains '='
2-
--> $DIR/E0662.rs:6:12
2+
--> $DIR/E0662.rs:8:12
33
|
44
LL | : "=test"("a")
55
| ^^^^^^^

src/test/ui/error-codes/E0663.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-emscripten
2+
13
#![feature(asm)]
24

35
fn main() {

src/test/ui/error-codes/E0663.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0663]: input operand constraint contains '+'
2-
--> $DIR/E0663.rs:6:12
2+
--> $DIR/E0663.rs:8:12
33
|
44
LL | : "+test"("a")
55
| ^^^^^^^

src/test/ui/error-codes/E0664.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-emscripten
2+
13
#![feature(asm)]
24

35
fn main() {

src/test/ui/error-codes/E0664.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0664]: clobber should not be surrounded by braces
2-
--> $DIR/E0664.rs:7:12
2+
--> $DIR/E0664.rs:9:12
33
|
44
LL | : "{eax}"
55
| ^^^^^^^

src/test/ui/feature-gates/feature-gate-asm.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-emscripten
2+
13
fn main() {
24
unsafe {
35
asm!(""); //~ ERROR inline assembly is not stable enough

0 commit comments

Comments
 (0)