ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more test cleanup.

Browse Source 
Needed to build successfully when libc++ is the default STL.

Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.

Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
This commit is contained in:
Dan Albert 2014-10-16 20:46:05 -07:00
parent e9034b4502
commit ed7d193ae9
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libs/ui/tests/Android.mk
View File

@ -1,31 +1,36 @@
# Build the unit tests. #
# Copyright (C) 2014 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.
#
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SHARED_LIBRARIES := libui
LOCAL_SRC_FILES := Region_test.cpp
LOCAL_MODULE := Region_test
include $(BUILD_NATIVE_TEST)
# Build the unit tests. include $(CLEAR_VARS)
test_src_files := \ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
Region_test.cpp \ LOCAL_SRC_FILES := vec_test.cpp
vec_test.cpp \ LOCAL_MODULE := vec_test
mat_test.cpp include $(BUILD_NATIVE_TEST)
shared_libraries := \ include $(CLEAR_VARS)
libutils \ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
libui LOCAL_SRC_FILES := mat_test.cpp
LOCAL_MODULE := mat_test
static_libraries := \ include $(BUILD_NATIVE_TEST)
libgtest \
libgtest_main
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
$(eval LOCAL_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval include $(BUILD_NATIVE_TEST)) \
)
# Build the unit tests.
# Build the manual test programs.
include $(call all-makefiles-under, $(LOCAL_PATH))

7
libs/ui/tests/vec_test.cpp
View File

@ -16,17 +16,18 @@
#define LOG_TAG "RegionTest" #define LOG_TAG "RegionTest"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <ui/Region.h> #include <ui/Region.h>
#include <ui/Rect.h> #include <ui/Rect.h>
#include <gtest/gtest.h>
#include <ui/vec4.h> #include <ui/vec4.h>
#include <gtest/gtest.h>
namespace android { namespace android {
class VecTest : public testing::Test { class VecTest : public testing::Test {
protected:
}; };
TEST_F(VecTest, Basics) { TEST_F(VecTest, Basics) {