Rewrite .gitattributes CRLF ui tests into run-make tests

Author: Oneirical

tests/ui/json/json-bom-plus-crlf-multifile.stderr renamed to tests/run-make/json-bom-plus-crlf-multifile/json-bom-plus-crlf-multifile.stderr

@@ -0,0 +1,49 @@
+//@ reference: input.byte-order-mark
+//@ reference: input.crlf
+
+use run_make_support::{rfs, rustc, tmp_dir};
+
+fn main() {
+    let aux_content = "\u{FEFF}\
+pub fn test() {\r\n\
+\r\n\
+    let s : String = 1;  // Error in the middle of line.\r\n\
+\r\n\
+    let s : String = 1\r\n\
+    ;  // Error before the newline.\r\n\
+\r\n\
+    let s : String =\r\n\
+1;  // Error after the newline.\r\n\
+\r\n\
+    let s : String = (\r\n\
+    );  // Error spanning the newline.\r\n\
+}\r\n";
+
+    rfs::write(tmp_dir().join("json-bom-plus-crlf-multifile-aux.rs"), aux_content).unwrap();
+
+    let aux_bytes = rfs::read(tmp_dir().join("json-bom-plus-crlf-multifile-aux.rs")).unwrap();
+    assert!(aux_bytes.starts_with(b"\xEF\xBB\xBF"), "File must start with UTF-8 BOM");
+    assert!(aux_bytes.windows(2).any(|w| w == b"\r\n"), "File must contain CRLF line endings");
+
+    let main_content = "\u{FEFF}\
+#[path = \"json-bom-plus-crlf-multifile-aux.rs\"]\r\n\
+mod json_bom_plus_crlf_multifile_aux;\r\n\
+\r\n\
+fn main() {\r\n\
+    json_bom_plus_crlf_multifile_aux::test();\r\n\
+}\r\n";
+
+    rfs::write(tmp_dir().join("json-bom-plus-crlf-multifile.rs"), main_content).unwrap();
+
+    let output = rustc()
+        .input(tmp_dir().join("json-bom-plus-crlf-multifile.rs"))
+        .json("diagnostic-short")
+        .error_format("json")
+        .run_fail()
+        .stderr_utf8();
+
+    diff()
+        .expected_file("json-bom-plus-crlf-multifile.stderr")
+        .actual_text("stderr", &output)
+        .run();
+}

tests/run-make/json-bom-plus-crlf-multifile/rmake.rs

@@ -0,0 +1,37 @@
+//@ reference: input.byte-order-mark
+//@ reference: input.crlf
+
+use run_make_support::{diff, rfs, rustc, tmp_dir};
+
+fn main() {
+    let main_content = "\u{FEFF}\
+fn main() {\r\n\
+\r\n\
+    let s : String = 1;  // Error in the middle of line.\r\n\
+\r\n\
+    let s : String = 1\r\n\
+    ;  // Error before the newline.\r\n\
+\r\n\
+    let s : String =\r\n\
+1;  // Error after the newline.\r\n\
+\r\n\
+    let s : String = (\r\n\
+    );  // Error spanning the newline.\r\n\
+}\r\n";
+
+    let main_path = tmp_dir().join("json-bom-plus-crlf.rs");
+    rfs::write(&main_path, main_content).unwrap();
+
+    let main_bytes = rfs::read(&main_path).unwrap();
+    assert!(main_bytes.starts_with(b"\xEF\xBB\xBF"), "File must start with UTF-8 BOM");
+    assert!(main_bytes.windows(2).any(|w| w == b"\r\n"), "File must contain CRLF line endings");
+
+    let output = rustc()
+        .input(&main_path)
+        .json("diagnostic-short")
+        .error_format("json")
+        .run_fail()
+        .stderr_utf8();
+
+    diff().expected_file("json-bom-plus-crlf.stderr").actual_text("stderr", &output).run();
+}

tests/ui/json/json-bom-plus-crlf.stderr renamed to tests/run-make/json-bom-plus-crlf/json-bom-plus-crlf.stderr

@@ -0,0 +1,39 @@
+//@ reference: input.crlf
+
+use run_make_support::{rfs, run, rustc, tmp_dir};
+
+fn main() {
+    let test_content = "/// Doc comment that ends in CRLF\r\n\
+pub fn foo() {}\r\n\
+\r\n\
+/** Block doc comment that\r\n\
+ *  contains CRLF characters\r\n\
+ */\r\n\
+pub fn bar() {}\r\n\
+\r\n\
+fn main() {\r\n\
+    let s = \"string\r\nliteral\";\r\n\
+    assert_eq!(s, \"string\\nliteral\");\r\n\
+\r\n\
+    let s = \"literal with \\\r\n\
+             escaped newline\";\r\n\
+    assert_eq!(s, \"literal with escaped newline\");\r\n\
+\r\n\
+    let s = r\"string\r\nliteral\";\r\n\
+    assert_eq!(s, \"string\\nliteral\");\r\n\
+    let s = br\"byte string\r\nliteral\";\r\n\
+    assert_eq!(s, \"byte string\\nliteral\".as_bytes());\r\n\
+\r\n\
+    // validate that our source file has CRLF endings\r\n\
+    let source = include_str!(file!());\r\n\
+    assert!(source.contains(\"string\\r\\nliteral\"));\r\n\
+}\r\n";
+
+    let test_path = tmp_dir().join("lexer-crlf-line-endings-string-literal-doc-comment.rs");
+    rfs::write(&test_path, test_content).unwrap();
+
+    let test_bytes = rfs::read(&test_path).unwrap();
+    assert!(test_bytes.windows(2).any(|w| w == b"\r\n"), "File must contain CRLF line endings");
+
+    rustc().input(&test_path).run();
+}

tests/run-make/json-bom-plus-crlf/rmake.rs

@@ -0,0 +1,22 @@
+use run_make_support::{diff, rfs, rustc, tmp_dir};
+
+fn main() {
+    let test_content = "fn main() {\n\
+    // \\r\\n\n\
+    let ok = \"This is \\\r\n\
+ a test\";\n\
+    // \\r only\n\
+    let bad = \"This is \\\r\
+ a test\";\n\
+}\n";
+
+    let test_path = tmp_dir().join("trailing-carriage-return-in-string.rs");
+    rfs::write(&test_path, test_content).unwrap();
+
+    let output = rustc().input(&test_path).run_fail().stderr_utf8();
+
+    diff()
+        .expected_file("trailing-carriage-return-in-string.stderr")
+        .actual_text("stderr", &output)
+        .run();
+}

tests/run-make/lexer-crlf-line-endings-string-literal-doc-comment/rmake.rs

@@ -1,6 +1 @@
-lexer-crlf-line-endings-string-literal-doc-comment.rs -text
-json-bom-plus-crlf.rs -text
-json-bom-plus-crlf-multifile.rs -text
-json-bom-plus-crlf-multifile-aux.rs -text
-trailing-carriage-return-in-string.rs -text
 *.bin -text