diff options
author | Igor Murashkin <iam@google.com> | 2012-11-06 17:02:54 -0800 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2012-11-27 11:38:06 -0800 |
commit | eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea (patch) | |
tree | aa511cddad9a1643fec806ed54e198923b4fcc65 /tests/camera2/CameraFrameTests.cpp | |
parent | 192e51c92a34645b5e6e864d9ba65b245bd37c2b (diff) | |
download | hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.zip hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.tar.gz hardware_libhardware-eab33fc589a8e1ca04f5703b5f1ace69f8ff9aea.tar.bz2 |
Camera2: Tests -- Fork each test before executing it
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).
Change-Id: Ib639885bdb827fc2415c878cbcb1b2d84dff687b
Diffstat (limited to 'tests/camera2/CameraFrameTests.cpp')
-rw-r--r-- | tests/camera2/CameraFrameTests.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp index 9e3482c..6f88312 100644 --- a/tests/camera2/CameraFrameTests.cpp +++ b/tests/camera2/CameraFrameTests.cpp @@ -32,6 +32,7 @@ #include <unistd.h> #include "CameraStreamFixture.h" +#include "TestExtensions.h" #define CAMERA_FRAME_TIMEOUT 1000000000 //nsecs (1 secs) #define CAMERA_HEAP_COUNT 2 //HALBUG: 1 means registerBuffers fails @@ -56,12 +57,16 @@ class CameraFrameTest public: CameraFrameTest() : CameraStreamFixture(STREAM_PARAMETERS) { + TEST_EXTENSION_FORKING_CONSTRUCTOR; + if (!HasFatalFailure()) { CreateStream(); } } ~CameraFrameTest() { + TEST_EXTENSION_FORKING_DESTRUCTOR; + if (mDevice.get()) { mDevice->waitUntilDrained(); } @@ -69,8 +74,10 @@ public: } virtual void SetUp() { + TEST_EXTENSION_FORKING_SET_UP; } virtual void TearDown() { + TEST_EXTENSION_FORKING_TEAR_DOWN; } protected: @@ -79,9 +86,7 @@ protected: TEST_P(CameraFrameTest, GetFrame) { - if (HasFatalFailure()) { - return; - } + TEST_EXTENSION_FORKING_INIT; /* Submit a PREVIEW type request, then wait until we get the frame back */ CameraMetadata previewRequest; |