Merge #884

884: Show the full hex value of a float that fails assert returns arithmetic nan or assert returns canonical nan. r=nlewycky a=nlewycky Co-authored-by: Nick Lewycky <[email protected]>
wasmerio · Oct 17, 2019 · 62b2cdc · 62b2cdc
2 parents 8c308d0 + c0acd5b
commit 62b2cdc
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/lib/spectests/tests/spectest.rs b/lib/spectests/tests/spectest.rs
@@ -445,8 +445,9 @@ mod tests {
                                                         "AssertReturnCanonicalNan"
                                                     ),
                                                     message: format!(
-                                                        "value is not canonical nan {:?}",
-                                                        v
+                                                        "value is not canonical nan {:?} ({:?})",
+                                                        v,
+                                                        value_to_hex(v.clone()),
                                                     ),
                                                 },
                                                 &test_key,
@@ -512,8 +513,9 @@ mod tests {
                                                         "AssertReturnArithmeticNan"
                                                     ),
                                                     message: format!(
-                                                        "value is not arithmetic nan {:?}",
-                                                        v
+                                                        "value is not arithmetic nan {:?} ({:?})",
+                                                        v,
+                                                        value_to_hex(v.clone()),
                                                     ),
                                                 },
                                                 &test_key,
@@ -945,6 +947,16 @@ mod tests {
         }
     }
 
+    fn value_to_hex(val: wasmer_runtime_core::types::Value) -> String {
+        match val {
+            wasmer_runtime_core::types::Value::I32(x) => format!("{:#x}", x),
+            wasmer_runtime_core::types::Value::I64(x) => format!("{:#x}", x),
+            wasmer_runtime_core::types::Value::F32(x) => format!("{:#x}", x.to_bits()),
+            wasmer_runtime_core::types::Value::F64(x) => format!("{:#x}", x.to_bits()),
+            wasmer_runtime_core::types::Value::V128(x) => format!("{:#x}", x),
+        }
+    }
+
     #[derive(Debug, Clone, Eq, PartialEq)]
     pub enum SpectestValue {
         I32(i32),