From 666bfcae214eccdef07b64671df8609a99a216eb Mon Sep 17 00:00:00 2001
From: Roger Curley <rocurley@gmail.com>
Date: Mon, 4 Aug 2025 13:27:47 -0400
Subject: [PATCH] Consolidate sqrt_domain tests

---
 library/coretests/tests/floats/f128.rs | 13 -------------
 library/coretests/tests/floats/f16.rs  | 13 -------------
 library/coretests/tests/floats/f32.rs  | 11 -----------
 library/coretests/tests/floats/f64.rs  | 11 -----------
 library/coretests/tests/floats/mod.rs  | 23 +++++++++++++++++++++++
 5 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/library/coretests/tests/floats/f128.rs b/library/coretests/tests/floats/f128.rs
index 551241c6c824..43882ad89a2d 100644
--- a/library/coretests/tests/floats/f128.rs
+++ b/library/coretests/tests/floats/f128.rs
@@ -78,19 +78,6 @@ fn test_powi() {
     assert_biteq!(neg_inf.powi(2), inf);
 }
 
-#[test]
-#[cfg(not(miri))]
-#[cfg(target_has_reliable_f128_math)]
-fn test_sqrt_domain() {
-    assert!(f128::NAN.sqrt().is_nan());
-    assert!(f128::NEG_INFINITY.sqrt().is_nan());
-    assert!((-1.0f128).sqrt().is_nan());
-    assert_biteq!((-0.0f128).sqrt(), -0.0);
-    assert_biteq!(0.0f128.sqrt(), 0.0);
-    assert_biteq!(1.0f128.sqrt(), 1.0);
-    assert_biteq!(f128::INFINITY.sqrt(), f128::INFINITY);
-}
-
 #[test]
 fn test_to_degrees() {
     let pi: f128 = consts::PI;
diff --git a/library/coretests/tests/floats/f16.rs b/library/coretests/tests/floats/f16.rs
index 23c2c7acb693..c405e4e5c85a 100644
--- a/library/coretests/tests/floats/f16.rs
+++ b/library/coretests/tests/floats/f16.rs
@@ -80,19 +80,6 @@ fn test_powi() {
     assert_biteq!(neg_inf.powi(2), inf);
 }
 
-#[test]
-#[cfg(not(miri))]
-#[cfg(target_has_reliable_f16_math)]
-fn test_sqrt_domain() {
-    assert!(f16::NAN.sqrt().is_nan());
-    assert!(f16::NEG_INFINITY.sqrt().is_nan());
-    assert!((-1.0f16).sqrt().is_nan());
-    assert_biteq!((-0.0f16).sqrt(), -0.0);
-    assert_biteq!(0.0f16.sqrt(), 0.0);
-    assert_biteq!(1.0f16.sqrt(), 1.0);
-    assert_biteq!(f16::INFINITY.sqrt(), f16::INFINITY);
-}
-
 #[test]
 fn test_to_degrees() {
     let pi: f16 = consts::PI;
diff --git a/library/coretests/tests/floats/f32.rs b/library/coretests/tests/floats/f32.rs
index 552cac942f9e..f08b033fb5ea 100644
--- a/library/coretests/tests/floats/f32.rs
+++ b/library/coretests/tests/floats/f32.rs
@@ -60,17 +60,6 @@ fn test_powi() {
     assert_biteq!(neg_inf.powi(2), inf);
 }
 
-#[test]
-fn test_sqrt_domain() {
-    assert!(f32::NAN.sqrt().is_nan());
-    assert!(f32::NEG_INFINITY.sqrt().is_nan());
-    assert!((-1.0f32).sqrt().is_nan());
-    assert_biteq!((-0.0f32).sqrt(), -0.0);
-    assert_biteq!(0.0f32.sqrt(), 0.0);
-    assert_biteq!(1.0f32.sqrt(), 1.0);
-    assert_biteq!(f32::INFINITY.sqrt(), f32::INFINITY);
-}
-
 #[test]
 fn test_to_degrees() {
     let pi: f32 = consts::PI;
diff --git a/library/coretests/tests/floats/f64.rs b/library/coretests/tests/floats/f64.rs
index 1c82406a91e4..8d7d31b57c18 100644
--- a/library/coretests/tests/floats/f64.rs
+++ b/library/coretests/tests/floats/f64.rs
@@ -55,17 +55,6 @@ fn test_powi() {
     assert_biteq!(neg_inf.powi(2), inf);
 }
 
-#[test]
-fn test_sqrt_domain() {
-    assert!(f64::NAN.sqrt().is_nan());
-    assert!(f64::NEG_INFINITY.sqrt().is_nan());
-    assert!((-1.0f64).sqrt().is_nan());
-    assert_biteq!((-0.0f64).sqrt(), -0.0);
-    assert_biteq!(0.0f64.sqrt(), 0.0);
-    assert_biteq!(1.0f64.sqrt(), 1.0);
-    assert_biteq!(f64::INFINITY.sqrt(), f64::INFINITY);
-}
-
 #[test]
 fn test_to_degrees() {
     let pi: f64 = consts::PI;
diff --git a/library/coretests/tests/floats/mod.rs b/library/coretests/tests/floats/mod.rs
index e9210c558f14..68ed8d47094f 100644
--- a/library/coretests/tests/floats/mod.rs
+++ b/library/coretests/tests/floats/mod.rs
@@ -1122,3 +1122,26 @@ float_test! {
         assert_biteq!(nan2.next_down(), nan2);
     }
 }
+
+// FIXME(f16_f128,miri): many of these have to be disabled since miri does not yet support
+// the intrinsics.
+
+float_test! {
+    name: sqrt_domain,
+    attrs: {
+        const: #[cfg(false)],
+        f16: #[cfg(all(not(miri), target_has_reliable_f16_math))],
+        f128: #[cfg(all(not(miri), target_has_reliable_f128_math))],
+    },
+    test<Float> {
+        let one: Float = 1.0;
+        let zero: Float = 0.0;
+        assert!(Float::NAN.sqrt().is_nan());
+        assert!(Float::NEG_INFINITY.sqrt().is_nan());
+        assert!((-one).sqrt().is_nan());
+        assert_biteq!((-zero).sqrt(), -zero);
+        assert_biteq!(zero.sqrt(), zero);
+        assert_biteq!(one.sqrt(), one);
+        assert_biteq!(Float::INFINITY.sqrt(), Float::INFINITY);
+    }
+}