From 729c22e7979ca2f1f82caedf5a7b245d59ea6dbc Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Fri, 4 May 2018 18:40:46 +0200
Subject: move simd-minmax-test to run-pass; require llvm 7

---
 src/test/codegen/simd-intrinsic-float-minmax.rs  |  2 +-
 src/test/run-fail/simd-intrinsic-float-minmax.rs | 57 ------------------------
 src/test/run-pass/simd-intrinsic-float-minmax.rs | 56 +++++++++++++++++++++++
 3 files changed, 57 insertions(+), 58 deletions(-)
 delete mode 100644 src/test/run-fail/simd-intrinsic-float-minmax.rs
 create mode 100644 src/test/run-pass/simd-intrinsic-float-minmax.rs

(limited to 'src/test')

diff --git a/src/test/codegen/simd-intrinsic-float-minmax.rs b/src/test/codegen/simd-intrinsic-float-minmax.rs
index 6663b841808..d963c7e8ddf 100644
--- a/src/test/codegen/simd-intrinsic-float-minmax.rs
+++ b/src/test/codegen/simd-intrinsic-float-minmax.rs
@@ -16,7 +16,7 @@
 #![crate_type = "lib"]
 
 #![feature(repr_simd, platform_intrinsics)]
-#[allow(non_camel_case_types)]
+#![allow(non_camel_case_types)]
 
 #[repr(simd)]
 #[derive(Copy, Clone, PartialEq, Debug)]
diff --git a/src/test/run-fail/simd-intrinsic-float-minmax.rs b/src/test/run-fail/simd-intrinsic-float-minmax.rs
deleted file mode 100644
index f4fb8e12250..00000000000
--- a/src/test/run-fail/simd-intrinsic-float-minmax.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-emscripten
-// min-llvm-version 6.0
-// error-pattern: panicked
-
-// Test that the simd_f{min,max} intrinsics produce the correct results.
-
-#![feature(repr_simd, platform_intrinsics)]
-#[allow(non_camel_case_types)]
-
-#[repr(simd)]
-#[derive(Copy, Clone, PartialEq, Debug)]
-struct f32x4(pub f32, pub f32, pub f32, pub f32);
-
-extern "platform-intrinsic" {
-    fn simd_fmin<T>(x: T, y: T) -> T;
-    fn simd_fmax<T>(x: T, y: T) -> T;
-}
-
-fn main() {
-    let x = f32x4(1.0, 2.0, 3.0, 4.0);
-    let y = f32x4(2.0, 1.0, 4.0, 3.0);
-    let nan = ::std::f32::NAN;
-    let n = f32x4(nan, nan, nan, nan);
-
-    unsafe {
-        let min0 = simd_fmin(x, y);
-        let min1 = simd_fmin(y, x);
-        assert_eq!(min0, min1);
-        let e = f32x4(1.0, 1.0, 3.0, 3.0);
-        assert_eq!(min0, e);
-        let minn = simd_fmin(x, n);
-        assert_eq!(minn, x);
-        let minn = simd_fmin(y, n);
-        assert_eq!(minn, y);
-
-        // FIXME(49261)
-        let max0 = simd_fmax(x, y);
-        let max1 = simd_fmax(y, x);
-        assert_eq!(max0, max1);
-        let e = f32x4(2.0, 2.0, 4.0, 4.0);
-        assert_eq!(max0, e);
-        let maxn = simd_fmax(x, n);
-        assert_eq!(maxn, x);
-        let maxn = simd_fmax(y, n);
-        assert_eq!(maxn, y);
-    }
-}
diff --git a/src/test/run-pass/simd-intrinsic-float-minmax.rs b/src/test/run-pass/simd-intrinsic-float-minmax.rs
new file mode 100644
index 00000000000..71c0139bb03
--- /dev/null
+++ b/src/test/run-pass/simd-intrinsic-float-minmax.rs
@@ -0,0 +1,56 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// ignore-emscripten
+// min-llvm-version 7.0
+// error-pattern: panicked
+
+// Test that the simd_f{min,max} intrinsics produce the correct results.
+
+#![feature(repr_simd, platform_intrinsics)]
+#![allow(non_camel_case_types)]
+
+#[repr(simd)]
+#[derive(Copy, Clone, PartialEq, Debug)]
+struct f32x4(pub f32, pub f32, pub f32, pub f32);
+
+extern "platform-intrinsic" {
+    fn simd_fmin<T>(x: T, y: T) -> T;
+    fn simd_fmax<T>(x: T, y: T) -> T;
+}
+
+fn main() {
+    let x = f32x4(1.0, 2.0, 3.0, 4.0);
+    let y = f32x4(2.0, 1.0, 4.0, 3.0);
+    let nan = ::std::f32::NAN;
+    let n = f32x4(nan, nan, nan, nan);
+
+    unsafe {
+        let min0 = simd_fmin(x, y);
+        let min1 = simd_fmin(y, x);
+        assert_eq!(min0, min1);
+        let e = f32x4(1.0, 1.0, 3.0, 3.0);
+        assert_eq!(min0, e);
+        let minn = simd_fmin(x, n);
+        assert_eq!(minn, x);
+        let minn = simd_fmin(y, n);
+        assert_eq!(minn, y);
+
+        let max0 = simd_fmax(x, y);
+        let max1 = simd_fmax(y, x);
+        assert_eq!(max0, max1);
+        let e = f32x4(2.0, 2.0, 4.0, 4.0);
+        assert_eq!(max0, e);
+        let maxn = simd_fmax(x, n);
+        assert_eq!(maxn, x);
+        let maxn = simd_fmax(y, n);
+        assert_eq!(maxn, y);
+    }
+}
-- 
cgit 1.4.1-3-g733a5