about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduardo Broto <ebroto@tutanota.com>2020-04-26 00:00:30 +0200
committerEduardo Broto <ebroto@tutanota.com>2020-04-26 21:27:29 +0200
commit4a405c9977e19807b3ac993a7a8e198d27d551b1 (patch)
treeeea7fea3f716dbba7f90263588d85e20acc808b1
parentce50e42ed667eb3e3fe26f05881e7d312e503970 (diff)
downloadrust-4a405c9977e19807b3ac993a7a8e198d27d551b1.tar.gz
rust-4a405c9977e19807b3ac993a7a8e198d27d551b1.zip
Remove some OSes from the test to comply with stderr line limit
-rw-r--r--tests/ui/mismatched_target_os.fixed6
-rw-r--r--tests/ui/mismatched_target_os.rs6
-rw-r--r--tests/ui/mismatched_target_os.stderr36
3 files changed, 8 insertions, 40 deletions
diff --git a/tests/ui/mismatched_target_os.fixed b/tests/ui/mismatched_target_os.fixed
index b89a29e9243..3dfd0a3c575 100644
--- a/tests/ui/mismatched_target_os.fixed
+++ b/tests/ui/mismatched_target_os.fixed
@@ -38,12 +38,6 @@ fn fuchsia() {}
 #[cfg(target_os = "haiku")]
 fn haiku() {}
 
-#[cfg(target_os = "illumos")]
-fn illumos() {}
-
-#[cfg(target_os = "l4re")]
-fn l4re() {}
-
 #[cfg(target_os = "redox")]
 fn redox() {}
 
diff --git a/tests/ui/mismatched_target_os.rs b/tests/ui/mismatched_target_os.rs
index 66b2e7c8fdd..436ed6213eb 100644
--- a/tests/ui/mismatched_target_os.rs
+++ b/tests/ui/mismatched_target_os.rs
@@ -38,12 +38,6 @@ fn fuchsia() {}
 #[cfg(haiku)]
 fn haiku() {}
 
-#[cfg(illumos)]
-fn illumos() {}
-
-#[cfg(l4re)]
-fn l4re() {}
-
 #[cfg(redox)]
 fn redox() {}
 
diff --git a/tests/ui/mismatched_target_os.stderr b/tests/ui/mismatched_target_os.stderr
index 9cc1439ccc8..0771681e628 100644
--- a/tests/ui/mismatched_target_os.stderr
+++ b/tests/ui/mismatched_target_os.stderr
@@ -112,26 +112,6 @@ LL | #[cfg(haiku)]
 error: operating system used in target family position
   --> $DIR/mismatched_target_os.rs:41:1
    |
-LL | #[cfg(illumos)]
-   | ^^^^^^-------^^
-   |       |
-   |       help: try: `target_os = "illumos"`
-   |
-   = help: Did you mean `unix`?
-
-error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:44:1
-   |
-LL | #[cfg(l4re)]
-   | ^^^^^^----^^
-   |       |
-   |       help: try: `target_os = "l4re"`
-   |
-   = help: Did you mean `unix`?
-
-error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:47:1
-   |
 LL | #[cfg(redox)]
    | ^^^^^^-----^^
    |       |
@@ -140,7 +120,7 @@ LL | #[cfg(redox)]
    = help: Did you mean `unix`?
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:50:1
+  --> $DIR/mismatched_target_os.rs:44:1
    |
 LL | #[cfg(solaris)]
    | ^^^^^^-------^^
@@ -150,7 +130,7 @@ LL | #[cfg(solaris)]
    = help: Did you mean `unix`?
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:53:1
+  --> $DIR/mismatched_target_os.rs:47:1
    |
 LL | #[cfg(vxworks)]
    | ^^^^^^-------^^
@@ -160,7 +140,7 @@ LL | #[cfg(vxworks)]
    = help: Did you mean `unix`?
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:58:1
+  --> $DIR/mismatched_target_os.rs:52:1
    |
 LL | #[cfg(cloudabi)]
    | ^^^^^^--------^^
@@ -168,7 +148,7 @@ LL | #[cfg(cloudabi)]
    |       help: try: `target_os = "cloudabi"`
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:61:1
+  --> $DIR/mismatched_target_os.rs:55:1
    |
 LL | #[cfg(hermit)]
    | ^^^^^^------^^
@@ -176,7 +156,7 @@ LL | #[cfg(hermit)]
    |       help: try: `target_os = "hermit"`
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:64:1
+  --> $DIR/mismatched_target_os.rs:58:1
    |
 LL | #[cfg(wasi)]
    | ^^^^^^----^^
@@ -184,7 +164,7 @@ LL | #[cfg(wasi)]
    |       help: try: `target_os = "wasi"`
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:67:1
+  --> $DIR/mismatched_target_os.rs:61:1
    |
 LL | #[cfg(none)]
    | ^^^^^^----^^
@@ -192,7 +172,7 @@ LL | #[cfg(none)]
    |       help: try: `target_os = "none"`
 
 error: operating system used in target family position
-  --> $DIR/mismatched_target_os.rs:71:1
+  --> $DIR/mismatched_target_os.rs:65:1
    |
 LL | #[cfg(all(not(any(windows, linux)), freebsd))]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -207,5 +187,5 @@ help: try
 LL | #[cfg(all(not(any(windows, linux)), target_os = "freebsd"))]
    |                                     ^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 21 previous errors
+error: aborting due to 19 previous errors