From e4e5b2f23fa85cae789dc6824ea8af321e211d60 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Wed, 20 Feb 2013 16:50:13 -0800 Subject: Camera: Add unit test infrastructure for libcameraclient Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c --- camera/Android.mk | 7 +++++-- camera/tests/Android.mk | 36 ++++++++++++++++++++++++++++++++++++ camera/tests/main.cpp | 27 +++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 camera/tests/Android.mk create mode 100644 camera/tests/main.cpp (limited to 'camera') diff --git a/camera/Android.mk b/camera/Android.mk index b66105b..a17ad1a 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -1,6 +1,9 @@ -LOCAL_PATH:= $(call my-dir) +CAMERA_CLIENT_LOCAL_PATH:= $(call my-dir) +include $(call all-subdir-makefiles) include $(CLEAR_VARS) +LOCAL_PATH := $(CAMERA_CLIENT_LOCAL_PATH) + LOCAL_SRC_FILES:= \ Camera.cpp \ CameraMetadata.cpp \ @@ -21,7 +24,7 @@ LOCAL_SHARED_LIBRARIES := \ libcamera_metadata \ LOCAL_C_INCLUDES += \ - system/media/camera/include + system/media/camera/include \ LOCAL_MODULE:= libcamera_client diff --git a/camera/tests/Android.mk b/camera/tests/Android.mk new file mode 100644 index 0000000..586e814 --- /dev/null +++ b/camera/tests/Android.mk @@ -0,0 +1,36 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main.cpp \ + +LOCAL_SHARED_LIBRARIES := \ + libutils \ + libcutils \ + libstlport \ + libcamera_metadata \ + libcamera_client \ + libgui \ + libsync \ + libui \ + libdl + +LOCAL_STATIC_LIBRARIES := \ + libgtest + +LOCAL_C_INCLUDES += \ + bionic \ + bionic/libstdc++/include \ + external/gtest/include \ + external/stlport/stlport \ + system/media/camera/include \ + frameworks/av/services/camera/libcameraservice \ + frameworks/av/include/camera \ + frameworks/native/include \ + +LOCAL_CFLAGS += -Wall -Wextra + +LOCAL_MODULE:= camera_client_test +LOCAL_MODULE_TAGS := tests + +include $(BUILD_EXECUTABLE) diff --git a/camera/tests/main.cpp b/camera/tests/main.cpp new file mode 100644 index 0000000..8c8c515 --- /dev/null +++ b/camera/tests/main.cpp @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + + +int main(int argc, char **argv) { + + ::testing::InitGoogleTest(&argc, argv); + + int ret = RUN_ALL_TESTS(); + + return ret; +} -- cgit v1.1