commit 8b527f2857f2c7e16caa5ff701b2696007b0ac16
author Elliott Hughes <enh@google.com> Sat Sep 15 15:40:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 15 15:40:03 2018 +0000
tree d3339f65abf5a93804a92f99ec439ed24aac7f23
parent ed16b344e75f422fb36fbfd91fb30de339475880
parent 670ea7aca905c5a93828b7c401ef320d65b8999f

Merge "Explicitly say `pthread_cancel` in the docs."

benchmarks/README.md

diff --git a/benchmarks/README.md b/benchmarks/README.md
index b3f0c3d..2616a51 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -13,8 +13,8 @@
     $ mma
     $ adb remount
     $ adb sync
-    $ adb shell /data/nativetest/bionic-benchmarks/bionic-benchmarks
-    $ adb shell /data/nativetest64/bionic-benchmarks/bionic-benchmarks
+    $ adb shell /data/benchmarktest/bionic-benchmarks/bionic-benchmarks
+    $ adb shell /data/benchmarktest64/bionic-benchmarks/bionic-benchmarks
 
 When operated without specifying an xml file, the default is to run all
 of the benchmarks in alphabetical order.

benchmarks/tests/interface_test.cpp

diff --git a/benchmarks/tests/interface_test.cpp b/benchmarks/tests/interface_test.cpp
index 89b6011..8e0e4f2 100644
--- a/benchmarks/tests/interface_test.cpp
+++ b/benchmarks/tests/interface_test.cpp
@@ -540,6 +540,15 @@
     "BM_string_strlen/32768/0/iterations:1\n"
     "BM_string_strlen/65536/0/iterations:1\n"
     "BM_string_strlen/131072/0/iterations:1\n"
+    "BM_string_strncmp/8/0/0/iterations:1\n"
+    "BM_string_strncmp/64/0/0/iterations:1\n"
+    "BM_string_strncmp/512/0/0/iterations:1\n"
+    "BM_string_strncmp/1024/0/0/iterations:1\n"
+    "BM_string_strncmp/8192/0/0/iterations:1\n"
+    "BM_string_strncmp/16384/0/0/iterations:1\n"
+    "BM_string_strncmp/32768/0/0/iterations:1\n"
+    "BM_string_strncmp/65536/0/0/iterations:1\n"
+    "BM_string_strncmp/131072/0/0/iterations:1\n"
     "BM_string_strstr/8/0/0/iterations:1\n"
     "BM_string_strstr/64/0/0/iterations:1\n"
     "BM_string_strstr/512/0/0/iterations:1\n"