diff options
author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-31 17:07:25 +0000 |
---|---|---|
committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-31 17:07:25 +0000 |
commit | fa064e215b052dd67f9af2a073c55931116252b0 (patch) | |
tree | 9632f8c321c7524e4b0a8b84ff4caaf65f9b8c5c /Makefile.am | |
parent | Fix minidump_writer_unittest on Android (diff) | |
download | breakpad-fa064e215b052dd67f9af2a073c55931116252b0.tar.xz |
Fix 'make check' for Android
This patch allows 'make check' to work when performing
an Automake-based build of Breakpad for Android. This
requires to have an Android device connected, and the
'adb' tool in your path.
You can test that with something like:
configure --host=arm-linux-androideabi
make check
This is achieved by adding a new small shell script
under android/test-shell.sh, which is invoked by the
Makefile (see TESTS_ENVIRONMENT definition in
Makefile.am).
By default, this runs all unit tests, including those
for the processor and tools (which normally never run
on an Android device).
Note that the test suites fails (e.g. 11 failing tests
for the client library). This will be addressed in later
patches.
+ Modify android/run-checks.sh to run the client library
test suite on the device by default.
+ Add a new option (--all-tests) to android/run-checks.sh
which forces it to run the unit test suite for the host
binaries, and the full suite on the Android device.
+ Update README.ANDROID appropriately.
Review URL: https://breakpad.appspot.com/441002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1023 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 562c0bcf..14c7eebd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -301,7 +301,13 @@ check_SCRIPTS = \ endif TESTS = $(check_PROGRAMS) $(check_SCRIPTS) + +if ANDROID_HOST +# Wrapper script to run unit test programs on a connected Android device. +TESTS_ENVIRONMENT = $(top_srcdir)/android/test-shell.sh +else TESTS_ENVIRONMENT = +endif if LINUX_HOST src_client_linux_linux_dumper_unittest_helper_SOURCES = \ @@ -314,10 +320,12 @@ src_client_linux_linux_client_unittest_SOURCES = \ src/client/linux/handler/exception_handler_unittest.cc \ src/client/linux/minidump_writer/directory_reader_unittest.cc \ src/client/linux/minidump_writer/line_reader_unittest.cc \ + src/client/linux/minidump_writer/linux_core_dumper.cc \ src/client/linux/minidump_writer/linux_core_dumper_unittest.cc \ src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc \ src/client/linux/minidump_writer/minidump_writer_unittest.cc \ src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc \ + src/common/linux/elf_core_dump.cc \ src/common/linux/linux_libc_support_unittest.cc \ src/common/linux/tests/crash_generator.cc \ src/common/memory_unittest.cc \ @@ -342,13 +350,11 @@ src_client_linux_linux_client_unittest_LDADD = \ src/client/linux/log/log.o \ src/client/linux/crash_generation/crash_generation_client.o \ src/client/linux/minidump_writer/linux_dumper.o \ - src/client/linux/minidump_writer/linux_core_dumper.o \ src/client/linux/minidump_writer/linux_ptrace_dumper.o \ src/client/linux/minidump_writer/minidump_writer.o \ src/client/minidump_file_writer.o \ src/common/convert_UTF.o \ src/common/md5.o \ - src/common/linux/elf_core_dump.o \ src/common/linux/elfutils.o \ src/common/linux/file_id.o \ src/common/linux/guid_creator.o \ |