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

16 files changed, 63 insertions, 49 deletions

diff --git a/src/test/ui/.gitattributes b/src/test/ui/.gitattributes
index 825f664bf9f..b62ade73aa9 100644
--- a/src/test/ui/.gitattributes
+++ b/src/test/ui/.gitattributes
@@ -1 +1,2 @@
-trailing-carriage-return-in-string.rs -text
\ No newline at end of file
+lexer-crlf-line-endings-string-literal-doc-comment.rs -text
+trailing-carriage-return-in-string.rs -text
diff --git a/src/test/ui/error-codes/E0661.rs b/src/test/ui/error-codes/E0661.rs
index 8d355a8a021..2440e3a446e 100644
--- a/src/test/ui/error-codes/E0661.rs
+++ b/src/test/ui/error-codes/E0661.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0661.stderr b/src/test/ui/error-codes/E0661.stderr
index 30a23fd58c5..58f7e7fa0f9 100644
--- a/src/test/ui/error-codes/E0661.stderr
+++ b/src/test/ui/error-codes/E0661.stderr
@@ -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));
    |                  ^^^
diff --git a/src/test/ui/error-codes/E0662.rs b/src/test/ui/error-codes/E0662.rs
index 7fe528c4745..343ed27f83f 100644
--- a/src/test/ui/error-codes/E0662.rs
+++ b/src/test/ui/error-codes/E0662.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0662.stderr b/src/test/ui/error-codes/E0662.stderr
index 0d3701aa955..3b2f7632f39 100644
--- a/src/test/ui/error-codes/E0662.stderr
+++ b/src/test/ui/error-codes/E0662.stderr
@@ -1,5 +1,5 @@
 error[E0662]: input operand constraint contains '='
-  --> $DIR/E0662.rs:6:12
+  --> $DIR/E0662.rs:8:12
    |
 LL |          : "=test"("a")
    |            ^^^^^^^
diff --git a/src/test/ui/error-codes/E0663.rs b/src/test/ui/error-codes/E0663.rs
index e5b8156cfb3..cfbb4b37758 100644
--- a/src/test/ui/error-codes/E0663.rs
+++ b/src/test/ui/error-codes/E0663.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0663.stderr b/src/test/ui/error-codes/E0663.stderr
index 46a079af152..4ac0a85f26d 100644
--- a/src/test/ui/error-codes/E0663.stderr
+++ b/src/test/ui/error-codes/E0663.stderr
@@ -1,5 +1,5 @@
 error[E0663]: input operand constraint contains '+'
-  --> $DIR/E0663.rs:6:12
+  --> $DIR/E0663.rs:8:12
    |
 LL |          : "+test"("a")
    |            ^^^^^^^
diff --git a/src/test/ui/error-codes/E0664.rs b/src/test/ui/error-codes/E0664.rs
index 29ec7ced4fd..fe70c9f96e0 100644
--- a/src/test/ui/error-codes/E0664.rs
+++ b/src/test/ui/error-codes/E0664.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0664.stderr b/src/test/ui/error-codes/E0664.stderr
index 3a99fce6eed..435e465920b 100644
--- a/src/test/ui/error-codes/E0664.stderr
+++ b/src/test/ui/error-codes/E0664.stderr
@@ -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}"
    |            ^^^^^^^
diff --git a/src/test/ui/feature-gates/feature-gate-asm.rs b/src/test/ui/feature-gates/feature-gate-asm.rs
index 572d9f26cae..1fce279c9ef 100644
--- a/src/test/ui/feature-gates/feature-gate-asm.rs
+++ b/src/test/ui/feature-gates/feature-gate-asm.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 fn main() {
     unsafe {
         asm!(""); //~ ERROR inline assembly is not stable enough
diff --git a/src/test/ui/feature-gates/feature-gate-asm.stderr b/src/test/ui/feature-gates/feature-gate-asm.stderr
index ab5cda43bfc..bfa4c87bed5 100644
--- a/src/test/ui/feature-gates/feature-gate-asm.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm.stderr
@@ -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!("");
    |         ^^^
diff --git a/src/test/ui/feature-gates/feature-gate-asm2.rs b/src/test/ui/feature-gates/feature-gate-asm2.rs
index 259b0a14e5c..82900eb7e6c 100644
--- a/src/test/ui/feature-gates/feature-gate-asm2.rs
+++ b/src/test/ui/feature-gates/feature-gate-asm2.rs
@@ -1,4 +1,5 @@
 // gate-test-asm
+// ignore-emscripten
 
 fn main() {
     unsafe {
diff --git a/src/test/ui/feature-gates/feature-gate-asm2.stderr b/src/test/ui/feature-gates/feature-gate-asm2.stderr
index 7519cad9a96..e985818f30e 100644
--- a/src/test/ui/feature-gates/feature-gate-asm2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm2.stderr
@@ -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!(""));
    |                          ^^^
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
index 937bce1b655..09e8d55c06b 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
@@ -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 {
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
index 7edf235652f..6a4416d78f3 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
@@ -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");
    |                ^^^^^^^^^^^
diff --git a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
index 74292f5eb7e..ada253aacfb 100644
--- a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
@@ -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"));

+}