commit 6abd53777bf013d5bf6bab2cd1ddce78c3b5b9ad
author Anton Danielsson <anton.danielsson@dirac.se> Wed Oct 07 09:12:56 2015 +0200
committer Anton Danielsson <anton.danielsson@dirac.se> Fri Oct 09 08:47:36 2015 +0200
tree 54f7e8d3f88be5c6c6a06a52d686be86ede69c0e
parent df0df4aba9d5997cdcddcec351ed5b5af180bb88

Use stringstream instead of atoi to avoid sign error.

The sane thing here would be to use std::stoul but this is not available in the android-ndk...

test/filter_test.cc

diff --git a/test/filter_test.cc b/test/filter_test.cc
index ca9f6cc..2a278ff 100644
--- a/test/filter_test.cc
+++ b/test/filter_test.cc
@@ -74,12 +74,18 @@
   TestReporter test_reporter;
   benchmark::RunSpecifiedBenchmarks(&test_reporter);
 
-  // Make sure we ran all of the tests
-  const size_t count = test_reporter.GetCount();
-  const size_t expected = (argc == 2) ? std::atol(argv[1]) : count;
-  if (count != expected) {
-    std::cerr << "ERROR: Expected " << expected << " tests to be ran but only "
-              << count << " completed" << std::endl;
-    return -1;
+  if (argc == 2) {
+    // Make sure we ran all of the tests
+    std::stringstream ss(argv[1]);
+    size_t expected;
+    ss >> expected;
+
+    const size_t count = test_reporter.GetCount();
+    if (count != expected) {
+      std::cerr << "ERROR: Expected " << expected << " tests to be ran but only "
+                << count << " completed" << std::endl;
+      return -1;
+    }
   }
+  return 0;
 }