summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-08-28 23:15:07 +0200
committerTianjie Xu <xunchang@google.com>2017-08-29 06:56:33 +0200
commitc89d1e7e2a6a8a07bb336db35db88f5452d8a51d (patch)
treebb13d2572bc220a73808f455c5191e62e64c368a /tests
parentMerge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." (diff)
downloadandroid_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar.gz
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar.bz2
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar.lz
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar.xz
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.tar.zst
android_bootable_recovery-c89d1e7e2a6a8a07bb336db35db88f5452d8a51d.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk7
-rw-r--r--tests/component/applypatch_test.cpp8
2 files changed, 4 insertions, 11 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index f2497b8b3..748d9c87b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
# Unit tests
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := recovery_unit_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_STATIC_LIBRARIES := \
@@ -46,7 +46,7 @@ include $(BUILD_NATIVE_TEST)
# Manual tests
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := recovery_manual_test
LOCAL_STATIC_LIBRARIES := \
libminui \
@@ -81,6 +81,7 @@ include $(BUILD_NATIVE_TEST)
# Component tests
include $(CLEAR_VARS)
LOCAL_CFLAGS := \
+ -Wall \
-Werror \
-D_FILE_OFFSET_BITS=64
@@ -191,7 +192,7 @@ include $(BUILD_NATIVE_TEST)
# Host tests
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -Werror
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := recovery_host_test
LOCAL_MODULE_HOST_OS := linux
LOCAL_C_INCLUDES := bootable/recovery
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index 016fed9b1..42542898b 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -61,14 +61,6 @@ static void mangle_file(const std::string& fname) {
ASSERT_TRUE(android::base::WriteStringToFile(content, fname));
}
-static bool file_cmp(const std::string& f1, const std::string& f2) {
- std::string c1;
- android::base::ReadFileToString(f1, &c1);
- std::string c2;
- android::base::ReadFileToString(f2, &c2);
- return c1 == c2;
-}
-
class ApplyPatchTest : public ::testing::Test {
public:
static void SetUpTestCase() {