Skip to content

Commit

Permalink
[tests] Remove libdbus-glib dependency from test cases. JB#51115
Browse files Browse the repository at this point in the history
OBS builds fail because test code can't be linked against dbus-lib.
Went unnoticed in local builds as dbus-glib is still installed.

Also remove dbus-glib dependency from debian control while at it.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>
  • Loading branch information
spiiroin committed Dec 4, 2020
1 parent 3a3fdc4 commit d292eff
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion debian/control
Expand Up @@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 4.1.0),
pkg-config,
libglib2.0-dev,
libdbus-1-dev (>= 1.0),
libdbus-glib-1-dev,
python,
libtool,
autoconf,
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile.am
Expand Up @@ -3,7 +3,7 @@
#
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(C_GENFLAGS) $(C_OPTFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS)
AM_LDFLAGS = -Wl,--as-needed -pthread -rdynamic $(GLIB_LIBS) -ldsme -ldbus-1 -ldbus-glib-1 -lpthread -ldl -ldsme
AM_LDFLAGS = -Wl,--as-needed -pthread -rdynamic $(GLIB_LIBS) -ldsme -ldbus-1 -lpthread -ldl -ldsme
AM_CPPFLAGS = $(CPP_GENFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
TESTS = testmod_alarmtracker \
testmod_emergencycalltracker \
Expand Down

0 comments on commit d292eff

Please sign in to comment.