commit 810802c1d0e1911a37b973970c7cb82e4d440603
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 29 19:19:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 29 19:19:29 2017 +0000
tree ea0866c2ff1dcd6eceae061ed7441eed9a7137cf
parent 4eb332439a68e2b2f629e46f1e93d6246bfa53d9
parent 71b81a2bb26ef855c62501e9fe0a4b620e1d6e95

Merge "bionic: test: report kernel sha for clock_getcpuclockid failure"

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 9218078..ddeabbf 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -678,7 +678,13 @@
   // For invalid process.
   // We can't use -1 for invalid pid here, because clock_getcpuclockid() can't detect it.
   errno = 0;
-  ASSERT_EQ(ESRCH, clock_getcpuclockid(GetInvalidPid(), &clockid));
+  // If this fails, your kernel needs commit e1b6b6ce to be backported.
+  ASSERT_EQ(ESRCH, clock_getcpuclockid(GetInvalidPid(), &clockid)) << "\n"
+    << "Please ensure that the following kernel patches or their replacements have been applied:\n"
+    << "* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"
+    << "commit/?id=e1b6b6ce55a0a25c8aa8af019095253b2133a41a\n"
+    << "* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"
+    << "commit/?id=c80ed088a519da53f27b798a69748eaabc66aadf\n";
   ASSERT_EQ(0, errno);
 }