diff options
| author | Mukesh Agrawal <quiche@google.com> | 2016-11-15 02:50:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-15 02:50:51 +0000 |
| commit | d9bf9d12df1fd1824ee9ffb01cb3a0c2afafd352 (patch) | |
| tree | c78df2031713290651e26abacb930338c25512fb | |
| parent | 9736842836e9a101bf1416feebacf4621971f98e (diff) | |
| parent | 65c8e37c8cdec77280cdec4d4e2d875ef62abacc (diff) | |
| download | wifilogd-d9bf9d12df1fd1824ee9ffb01cb3a0c2afafd352.tar.gz | |
Merge "Revert "add host unit tests""
am: 65c8e37c8c
Change-Id: Ic9cfb8c4598f9c138663f29b14b9d2757eaac72c
| -rw-r--r-- | Android.mk | 53 | ||||
| -rwxr-xr-x | runtests.sh | 4 |
2 files changed, 18 insertions, 39 deletions
@@ -19,23 +19,6 @@ wifilogd_gtest_cpp_flags := -Wno-undef -Wno-missing-noreturn \ -Wno-shift-sign-overflow -Wno-used-but-marked-unused -Wno-deprecated \ -Wno-weak-vtables -Wno-sign-conversion -Wno-global-constructors \ -Wno-covered-switch-default -wifilogd_src_files := \ - command_processor.cpp \ - memory_reader.cpp \ - message_buffer.cpp \ - os.cpp \ - raw_os.cpp -wifilogd_test_src_files := \ - tests/byte_buffer_unittest.cpp \ - tests/command_processor_unittest.cpp \ - tests/local_utils_unittest.cpp \ - tests/main.cpp \ - tests/memory_reader_unittest.cpp \ - tests/message_buffer_unittest.cpp \ - tests/mock_os.cpp \ - tests/mock_raw_os.cpp \ - tests/os_unittest.cpp \ - tests/protocol_unittest.cpp wifilogd_parent_dir := $(LOCAL_PATH)/../ wifilogd_includes := \ @@ -48,7 +31,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := libwifilogd LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) LOCAL_C_INCLUDES := $(wifilogd_includes) -LOCAL_SRC_FILES := $(wifilogd_src_files) +LOCAL_SRC_FILES := \ + command_processor.cpp \ + memory_reader.cpp \ + message_buffer.cpp \ + os.cpp \ + raw_os.cpp LOCAL_SHARED_LIBRARIES := \ libbase \ liblog @@ -61,7 +49,17 @@ include $(CLEAR_VARS) LOCAL_MODULE := wifilogd_unit_test LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags) LOCAL_C_INCLUDES := $(wifilogd_includes) -LOCAL_SRC_FILES := $(wifilogd_test_src_files) +LOCAL_SRC_FILES := \ + tests/byte_buffer_unittest.cpp \ + tests/command_processor_unittest.cpp \ + tests/local_utils_unittest.cpp \ + tests/main.cpp \ + tests/memory_reader_unittest.cpp \ + tests/message_buffer_unittest.cpp \ + tests/mock_os.cpp \ + tests/mock_raw_os.cpp \ + tests/os_unittest.cpp \ + tests/protocol_unittest.cpp LOCAL_STATIC_LIBRARIES := \ libgmock \ libgtest \ @@ -70,20 +68,3 @@ LOCAL_SHARED_LIBRARIES := \ libbase \ liblog include $(BUILD_NATIVE_TEST) - -### -### wifilogd host unit tests. -### -include $(CLEAR_VARS) -LOCAL_MODULE := wifilogd_host_unit_test -LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags) -LOCAL_C_INCLUDES := $(wifilogd_includes) -LOCAL_SRC_FILES := $(wifilogd_src_files) $(wifilogd_test_src_files) -LOCAL_STATIC_LIBRARIES := \ - libgmock \ - libgtest -LOCAL_SHARED_LIBRARIES := \ - libbase \ - liblog -LOCAL_LDLIBS := -lrt -include $(BUILD_HOST_NATIVE_TEST) diff --git a/runtests.sh b/runtests.sh index 1551a44..9d6701a 100755 --- a/runtests.sh +++ b/runtests.sh @@ -30,12 +30,10 @@ make -j32 -C $ANDROID_BUILD_TOP -f build/core/main.mk \ set -x # print commands -$ANDROID_HOST_OUT/nativetest/wifilogd_host_unit_test/wifilogd_host_unit_test -$ANDROID_HOST_OUT/nativetest64/wifilogd_host_unit_test/wifilogd_host_unit_test - adb root adb wait-for-device adb remount adb sync + adb shell /data/nativetest/wifilogd_unit_test/wifilogd_unit_test adb shell /data/nativetest64/wifilogd_unit_test/wifilogd_unit_test |