diff options
| author | Lei YU <mine260309@gmail.com> | 2018-04-13 13:20:02 +0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-05-29 16:52:18 -0400 |
| commit | cd63eeebc2d4a561de7e7cfa45783fa63f0aa7c4 (patch) | |
| tree | 17b4bbc34152c19df5237ce47fe3c59ad58e7b4e | |
| parent | 20db3bf2f7aabea70aacfae341a8f43cf5e0dacc (diff) | |
| download | sdbusplus-cd63eeebc2d4a561de7e7cfa45783fa63f0aa7c4.tar.gz sdbusplus-cd63eeebc2d4a561de7e7cfa45783fa63f0aa7c4.zip | |
Fix test/Makefile.am to pass build on x86-64 SDK
Modify test/Makefile.am to link against pthread, otherwise it
gets link failures related to pthread.
Add OESDK flags, otherwise the binaries fails to execute on host.
Tested: Building the tests well on x86-64 SDK.
Executing of the tests are OK.
But several test cases fail or stuck at running.
Change-Id: I649d7ec566a44fe51d2b8c852cb20d8769b28d30
Signed-off-by: Lei YU <mine260309@gmail.com>
| -rw-r--r-- | test/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index b331847..cdc5f20 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,45 +1,53 @@ if WANT_LIBSDBUSPLUS AM_CPPFLAGS = -I$(top_srcdir) $(GTEST_CPPFLAGS) -gtest_ldadd = -lgtest -lgtest_main +gtest_ldadd = -lgtest -lgtest_main $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS) check_PROGRAMS = TESTS = $(check_PROGRAMS) check_PROGRAMS += bus_list_names +bus_list_names_CXXFLAGS = $(PTHREAD_CFLAGS) bus_list_names_SOURCES = bus/list_names.cpp bus_list_names_LDADD = $(gtest_ldadd) $(SYSTEMD_LIBS) $(top_builddir)/sdbusplus/sdbus.o check_PROGRAMS += bus_match +bus_match_CXXFLAGS = $(PTHREAD_CFLAGS) bus_match_SOURCES = bus/match.cpp bus_match_LDADD = $(gtest_ldadd) $(SYSTEMD_LIBS) $(top_builddir)/sdbusplus/sdbus.o check_PROGRAMS += message_append message_append_SOURCES = message/append.cpp message_append_CXXFLAGS = $(SYSTEMD_CFLAGS) $(PTHREAD_CFLAGS) -message_append_LDADD = $(SYSTEMD_LIBS) $(PTHREAD_LIBS) $(top_builddir)/sdbusplus/sdbus.o +message_append_LDADD = $(gtest_ldadd) $(SYSTEMD_LIBS) $(PTHREAD_LIBS) $(top_builddir)/sdbusplus/sdbus.o check_PROGRAMS += message_read message_read_SOURCES = message/read.cpp message_read_CXXFLAGS = $(SYSTEMD_CFLAGS) $(PTHREAD_CFLAGS) -message_read_LDADD = $(SYSTEMD_LIBS) $(PTHREAD_LIBS) $(top_builddir)/sdbusplus/sdbus.o +message_read_LDADD = $(gtest_ldadd) $(SYSTEMD_LIBS) $(PTHREAD_LIBS) $(top_builddir)/sdbusplus/sdbus.o check_PROGRAMS += message_native_types +message_native_types_CXXFLAGS = $(PTHREAD_CFLAGS) message_native_types_SOURCES = message/native_types.cpp message_native_types_LDADD = $(gtest_ldadd) check_PROGRAMS += message_types +message_types_CXXFLAGS = $(PTHREAD_CFLAGS) message_types_SOURCES = message/types.cpp message_types_LDADD = $(gtest_ldadd) check_PROGRAMS += utility_tuple_to_array +utility_tuple_to_array_CXXFLAGS = $(PTHREAD_CFLAGS) utility_tuple_to_array_SOURCES = utility/tuple_to_array.cpp utility_tuple_to_array_LDADD = $(gtest_ldadd) check_PROGRAMS += utility_type_traits +utility_type_traits_CXXFLAGS = $(PTHREAD_CFLAGS) utility_type_traits_SOURCES = utility/type_traits.cpp +utility_type_traits_LDADD = $(gtest_ldadd) check_PROGRAMS += vtable_vtable +vtable_vtable_CXXFLAGS = $(PTHREAD_CFLAGS) vtable_vtable_SOURCES = vtable/vtable.cpp vtable/vtable_c.c vtable_vtable_LDADD = $(gtest_ldadd) |
