commit 797976876f6afde0a3a114c1b8a12f26b4ebd666
author Eino-Ville Talvala <etalvala@google.com> Tue Jul 14 15:06:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 14 15:06:53 2015 +0000
tree 2d72a5b6fd6de933cac0bb8a8071617d5535102b
parent fa8430875ced1b31396cdea392b85cd33c1fee6c
parent d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8

am d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev

* commit 'd95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
  Camera2 tests: Fix incorrect error code check

tests/camera2/ForkedTests.cpp

diff --git a/tests/camera2/ForkedTests.cpp b/tests/camera2/ForkedTests.cpp
index 315233e..39599da 100644
--- a/tests/camera2/ForkedTests.cpp
+++ b/tests/camera2/ForkedTests.cpp
@@ -16,6 +16,8 @@
 
 #include <gtest/gtest.h>
 
+#include <stdlib.h>
+
 #include "TestExtensions.h"
 
 namespace android {
@@ -37,9 +39,7 @@
 // intentionally fail
 TEST_F(DISABLED_ForkedTest, FailCrash) {
     TEST_EXTENSION_FORKING_INIT;
-
-    //intentionally crash
-    *(int*)0 = 0xDEADBEEF;
+    abort();
 }
 
 TEST_F(DISABLED_ForkedTest, SucceedNormal) {