diff options
| author | Alex Deymo <deymo@google.com> | 2015-10-23 09:51:31 -0700 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2015-10-23 20:09:15 -0700 |
| commit | 792b0a5d2fc29cd8d5ba91be5dd1d34f0676f53b (patch) | |
| tree | 746e29770097160ac60b60c9c0022493f2a809df | |
| parent | 437b7afd23768d737055fa70b79f5f2f714583a5 (diff) | |
| download | bsdiff-792b0a5d2fc29cd8d5ba91be5dd1d34f0676f53b.tar.gz | |
Build unittests on Android.
The unitests were compiled in the Makefile but not on Android. This
patch builds the unittests for the host on Android.
Bug: 24478450
Test: mmma external/bsdiff && out/host/linux-x86/bin/bsdiff_unittest
Change-Id: Ib9f70e57273e585f31b46068d29b277aaae611eb
| -rw-r--r-- | Android.mk | 47 | ||||
| -rw-r--r-- | bsdiff_unittest.cc | 4 |
2 files changed, 43 insertions, 8 deletions
@@ -14,6 +14,7 @@ LOCAL_PATH := $(call my-dir) +# Common project flags. bsdiff_common_cflags := \ -D_FILE_OFFSET_BITS=64 \ -Wall \ @@ -21,6 +22,24 @@ bsdiff_common_cflags := \ -Wextra \ -Wno-unused-parameter +bsdiff_common_static_libs := \ + libbz + +bsdiff_common_unittests := \ + bsdiff_unittest.cc \ + extents_file_unittest.cc \ + extents_unittest.cc \ + test_utils.cc + +# "bsdiff" program. +bsdiff_shared_libs := \ + libdivsufsort64 \ + libdivsufsort + +bsdiff_src_files := \ + bsdiff.cc + +# "bspatch" program. bspatch_src_files := \ bspatch.cc \ extents.cc \ @@ -31,14 +50,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := bsdiff LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := \ - bsdiff.cc \ + $(bsdiff_src_files) \ bsdiff_main.cc LOCAL_CFLAGS := $(bsdiff_common_cflags) LOCAL_C_INCLUDES += external/bzip2 -LOCAL_STATIC_LIBRARIES := libbz -LOCAL_SHARED_LIBRARIES := \ - libdivsufsort64 \ - libdivsufsort +LOCAL_STATIC_LIBRARIES := $(bsdiff_common_static_libs) +LOCAL_SHARED_LIBRARIES := $(bsdiff_shared_libs) include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) @@ -49,5 +66,23 @@ LOCAL_SRC_FILES := \ bspatch_main.cc LOCAL_CFLAGS := $(bsdiff_common_cflags) LOCAL_C_INCLUDES += external/bzip2 -LOCAL_STATIC_LIBRARIES := libbz +LOCAL_STATIC_LIBRARIES := $(bsdiff_common_static_libs) +include $(BUILD_HOST_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_MODULE := bsdiff_unittest +LOCAL_MODULE_TAGS := debug tests +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES := \ + $(bsdiff_src_files) \ + $(bspatch_src_files) \ + $(bsdiff_common_unittests) \ + testrunner.cc +LOCAL_CFLAGS := $(bsdiff_common_cflags) +LOCAL_C_INCLUDES += external/bzip2 +LOCAL_STATIC_LIBRARIES := \ + $(bsdiff_common_static_libs) \ + libgtest_host \ + libgmock_host +LOCAL_SHARED_LIBRARIES := $(bsdiff_shared_libs) include $(BUILD_HOST_EXECUTABLE) diff --git a/bsdiff_unittest.cc b/bsdiff_unittest.cc index 54361a7..b3aae3e 100644 --- a/bsdiff_unittest.cc +++ b/bsdiff_unittest.cc @@ -42,7 +42,7 @@ TEST_F(BsdiffTest, EqualEmptyFiles) { // An empty bz2 file will have 14 bytes. EXPECT_EQ(14, patch.diff_len); - EXPECT_EQ(14, patch.extra_len); + EXPECT_EQ(14U, patch.extra_len); } TEST_F(BsdiffTest, EqualSmallFiles) { @@ -58,7 +58,7 @@ TEST_F(BsdiffTest, EqualSmallFiles) { // An empty bz2 file will have 14 bytes. EXPECT_EQ(14, patch.diff_len); - EXPECT_EQ(14, patch.extra_len); + EXPECT_EQ(14U, patch.extra_len); } } // namespace bsdiff |