about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-11-21 17:08:25 +0000
committerNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2023-11-24 19:15:52 +0100
commit0346765100b6499107a9a964638921c2cc641ee2 (patch)
tree33ad9fd2fb0a27fee43c79bfe667cb4bceab00eb
parent87a354b15d3fd3579610325b6a3061d28088b63f (diff)
downloadrust-0346765100b6499107a9a964638921c2cc641ee2.tar.gz
rust-0346765100b6499107a9a964638921c2cc641ee2.zip
Bless run-make tests
Co-authored-by: Adrian <adrian.iosdev@gmail.com>
-rw-r--r--tests/run-make/emit-to-stdout/emit-link.stderr2
-rw-r--r--tests/run-make/emit-to-stdout/emit-llvm-bc.stderr2
-rw-r--r--tests/run-make/emit-to-stdout/emit-metadata.stderr2
-rw-r--r--tests/run-make/emit-to-stdout/emit-multiple-types.stderr2
-rw-r--r--tests/run-make/emit-to-stdout/emit-obj.stderr2
-rw-r--r--tests/run-make/jobserver-error/jobserver.stderr2
-rw-r--r--tests/run-make/overwrite-input/file.stderr2
-rw-r--r--tests/run-make/overwrite-input/folder.stderr2
-rw-r--r--tests/run-make/overwrite-input/main.stderr2
-rw-r--r--tests/run-make/unknown-mod-stdin/unknown-mod.stderr2
10 files changed, 10 insertions, 10 deletions
diff --git a/tests/run-make/emit-to-stdout/emit-link.stderr b/tests/run-make/emit-to-stdout/emit-link.stderr
index a9d856503e6..0553b22a45e 100644
--- a/tests/run-make/emit-to-stdout/emit-link.stderr
+++ b/tests/run-make/emit-to-stdout/emit-link.stderr
@@ -1,4 +1,4 @@
 error: option `-o` or `--emit` is used to write binary output type `link` to stdout, but stdout is a tty
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/emit-to-stdout/emit-llvm-bc.stderr b/tests/run-make/emit-to-stdout/emit-llvm-bc.stderr
index 7b53bd16e7a..a50148f9ea8 100644
--- a/tests/run-make/emit-to-stdout/emit-llvm-bc.stderr
+++ b/tests/run-make/emit-to-stdout/emit-llvm-bc.stderr
@@ -1,4 +1,4 @@
 error: option `-o` or `--emit` is used to write binary output type `llvm-bc` to stdout, but stdout is a tty
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/emit-to-stdout/emit-metadata.stderr b/tests/run-make/emit-to-stdout/emit-metadata.stderr
index ee1e52937b9..27ad5d52921 100644
--- a/tests/run-make/emit-to-stdout/emit-metadata.stderr
+++ b/tests/run-make/emit-to-stdout/emit-metadata.stderr
@@ -1,4 +1,4 @@
 error: option `-o` or `--emit` is used to write binary output type `metadata` to stdout, but stdout is a tty
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/emit-to-stdout/emit-multiple-types.stderr b/tests/run-make/emit-to-stdout/emit-multiple-types.stderr
index b8a683cd9eb..4f74cb8409a 100644
--- a/tests/run-make/emit-to-stdout/emit-multiple-types.stderr
+++ b/tests/run-make/emit-to-stdout/emit-multiple-types.stderr
@@ -1,4 +1,4 @@
 error: can't use option `-o` or `--emit` to write multiple output types to stdout
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/emit-to-stdout/emit-obj.stderr b/tests/run-make/emit-to-stdout/emit-obj.stderr
index b1303530844..9bbcea01051 100644
--- a/tests/run-make/emit-to-stdout/emit-obj.stderr
+++ b/tests/run-make/emit-to-stdout/emit-obj.stderr
@@ -1,4 +1,4 @@
 error: option `-o` or `--emit` is used to write binary output type `obj` to stdout, but stdout is a tty
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/jobserver-error/jobserver.stderr b/tests/run-make/jobserver-error/jobserver.stderr
index d18e15a2628..d129db9bc67 100644
--- a/tests/run-make/jobserver-error/jobserver.stderr
+++ b/tests/run-make/jobserver-error/jobserver.stderr
@@ -1,4 +1,4 @@
 error: failed to acquire jobserver token: early EOF on jobserver pipe
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/run-make/overwrite-input/file.stderr b/tests/run-make/overwrite-input/file.stderr
index 9936962b4ee..c13a270b067 100644
--- a/tests/run-make/overwrite-input/file.stderr
+++ b/tests/run-make/overwrite-input/file.stderr
@@ -2,5 +2,5 @@ warning: ignoring --out-dir flag due to -o flag
 
 error: the input file "main.rs" would be overwritten by the generated executable
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/run-make/overwrite-input/folder.stderr b/tests/run-make/overwrite-input/folder.stderr
index 81b1e7367c7..6e51cb812ce 100644
--- a/tests/run-make/overwrite-input/folder.stderr
+++ b/tests/run-make/overwrite-input/folder.stderr
@@ -2,5 +2,5 @@ warning: ignoring --out-dir flag due to -o flag
 
 error: the generated executable for the input file "main.rs" conflicts with the existing directory "."
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/run-make/overwrite-input/main.stderr b/tests/run-make/overwrite-input/main.stderr
index 9936962b4ee..c13a270b067 100644
--- a/tests/run-make/overwrite-input/main.stderr
+++ b/tests/run-make/overwrite-input/main.stderr
@@ -2,5 +2,5 @@ warning: ignoring --out-dir flag due to -o flag
 
 error: the input file "main.rs" would be overwritten by the generated executable
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/run-make/unknown-mod-stdin/unknown-mod.stderr b/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
index 81ff8393837..bdbaa381709 100644
--- a/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
+++ b/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
@@ -7,6 +7,6 @@ error[E0583]: file not found for module `unknown`
   = help: to create the module `unknown`, create file "unknown.rs" or "unknown/mod.rs"
   = note: if there is a `mod unknown` elsewhere in the crate already, import it with `use crate::...` instead
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0583`.