Detect crashes while running native tests in APK.

testing/android/native_test_launcher.cc

Index: testing/android/native_test_launcher.cc
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index 1555fbe476ad378f0aba4ffcf2e6a3e90c2d009b..a42c6ad446d41e16e99aa89e6b556f5f3d46aca0 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

[John Grabowski, 2012/05/07 19:22:15]

Add explicit doc on our model: catch signals and print 'CRASHED' to help python
test runner blah blah catch blah.

[nilesh, 2012/05/08 01:38:10]

Done.

 
+#include <signal.h>
 #include <stdio.h>
 
 #include "base/android/jni_android.h"
@@ -25,6 +26,33 @@ extern int main(int argc, char** argv);
 
 namespace {
 
+// The list of signals which we consider to be crashes. We rethrow the

[Yaron, 2012/05/07 19:22:19]

Nit: Don't use "we" in comments.

[nilesh, 2012/05/08 01:38:10]

Done.

+// signal after handling it.
+static const int kExceptionSignals[] = {
+  SIGSEGV, SIGABRT, SIGFPE, SIGILL, SIGBUS, -1
+};
+
+static struct sigaction old_sa[NSIG];
+
+void SignalHandler(int sig, siginfo_t *info, void *reserved)
+{
+  // Output the crash marker.
+  LOG(ERROR) << "[ CRASHED      ]";

[John Grabowski, 2012/05/07 19:22:15]

Normally you cannot allocate memory in a signal handler.
Class LogMessage has an ostringstream member, which means it probably allocates
memory.

Consider __android_log_write() instead.

[nilesh, 2012/05/08 01:38:10]

Done. Thanks for catching this.

+  old_sa[sig].sa_sigaction(sig, info, reserved);
+}
+
+void InstallHandlers() {
+  struct sigaction sa;
+  memset(&sa, 0, sizeof(sa));
+
+  sa.sa_sigaction = SignalHandler;
+  sa.sa_flags = SA_SIGINFO;
+
+  for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
+    sigaction(kExceptionSignals[i], &sa, &old_sa[kExceptionSignals[i]]);
+  }
+}
+
 void ParseArgsFromString(const std::string& command_line,
                          std::vector<std::string>* args) {
   StringTokenizer tokenizer(command_line, kWhitespaceASCII);
@@ -189,11 +217,16 @@ static void RunTests(JNIEnv* env,
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+
+  // Install signal handlers to detect crashes.
+  InstallHandlers();
+
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!RegisterNativesImpl(env)) {
     return -1;
   }
   LibraryLoadedOnMainThread(env);
+
   return JNI_VERSION_1_4;
 }