Merge remote-tracking branch 'remotes/origin/master'

tatsy · Feb 7, 2015 · bc8df29 · bc8df29
2 parents d979758 + ad6ef50
commit bc8df29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -54,8 +54,8 @@ before_script:
 
 script:
     # run test
-    - make check
-    - ./cpplint.sh
+    - CTEST_OUTPUT_ON_FAILURE=TRUE make check
+    - sh ./cpplint.sh
 
 after_success:
     - lcov --directory . --capture --output-file coverage.info

diff --git a/tests/core/test_point.cpp b/tests/core/test_point.cpp
@@ -78,7 +78,7 @@ TEST(Point2d, Norm) {
         double dx = rng.randReal();
         double dy = rng.randReal();
         const Point2d p(dx, dy);
-        EXPECT_EQ(p.norm(), sqrt(dx * dx + dy * dy)) << "Norm: value does not match";
+        EXPECT_EQ(p.norm(), hypot(dx, dy)) << "Norm: value does not match";
     }
 }