commit b31d9c956cc78b721e35bf74c96c7284e453f30f
author Stephen Hines <srhines@google.com> Tue Jun 24 21:21:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 24 17:32:49 2014 +0000
tree 0529877939eb7cc76cb1875fa2a82b2d52cd1379
parent ba61895349d3c54e71d8851fd8fd1609ea91c716
parent 86557f6a54d33b21a453e4a860cedff1a7692f2a

Merge "Switch rootn(f, 0) tests to expect +inf instead of NaN."

java/tests/RSTest_CompatLib/src/com/android/rs/test/math_conformance.rs

diff --git a/java/tests/RSTest_CompatLib/src/com/android/rs/test/math_conformance.rs b/java/tests/RSTest_CompatLib/src/com/android/rs/test/math_conformance.rs
index 2d62f34..ae78feb 100644
--- a/java/tests/RSTest_CompatLib/src/com/android/rs/test/math_conformance.rs
+++ b/java/tests/RSTest_CompatLib/src/com/android/rs/test/math_conformance.rs
@@ -5,8 +5,8 @@
 static bool test_rootn() {
     bool failed = false;
 
-    // rootn(x, 0) -> NaN
-    _RS_ASSERT(isnan(rootn(1.0f, 0)));
+    // rootn(x, 0) -> _inf
+    _RS_ASSERT(isposinf(rootn(1.0f, 0)));
 
     // rootn(+/-0, n) -> +/-inf for odd n < 0
     _RS_ASSERT(isposinf(rootn(0.f, -3)));

java/tests/RsTest/src/com/android/rs/test/math_conformance.rs

diff --git a/java/tests/RsTest/src/com/android/rs/test/math_conformance.rs b/java/tests/RsTest/src/com/android/rs/test/math_conformance.rs
index 2d62f34..b813e20 100644
--- a/java/tests/RsTest/src/com/android/rs/test/math_conformance.rs
+++ b/java/tests/RsTest/src/com/android/rs/test/math_conformance.rs
@@ -5,8 +5,8 @@
 static bool test_rootn() {
     bool failed = false;
 
-    // rootn(x, 0) -> NaN
-    _RS_ASSERT(isnan(rootn(1.0f, 0)));
+    // rootn(x, 0) -> +inf
+    _RS_ASSERT(isposinf(rootn(1.0f, 0)));
 
     // rootn(+/-0, n) -> +/-inf for odd n < 0
     _RS_ASSERT(isposinf(rootn(0.f, -3)));