Skip to content

Commit

Permalink
Merge pull request #3 from spiiroin/hbtest3
Browse files Browse the repository at this point in the history
Add new utility for testing iphb timers
  • Loading branch information
Matti Kosola committed Jun 6, 2013
2 parents 92dce47 + 8bcf64b commit 588da8e
Show file tree
Hide file tree
Showing 6 changed files with 1,426 additions and 13 deletions.
3 changes: 3 additions & 0 deletions configure.ac
Expand Up @@ -43,6 +43,9 @@ AM_PROG_CC_C_O()

# Pkgconf checks
PKG_CHECK_MODULES(GLIB, glib-2.0)
PKG_CHECK_MODULES(DBUS, dbus-1)
PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1)
PKG_CHECK_MODULES(MCE, mce)

# Check libs (that are not yet checked)
AC_CHECK_LIB([dsme], [dsmesock_init], [AC_MSG_NOTICE([got libdsme])], AC_MSG_FAILURE([libdsme required!]), [$GLIB_LIBS])
Expand Down
4 changes: 4 additions & 0 deletions rpm/libiphb.spec
Expand Up @@ -19,7 +19,10 @@ Source100: libiphb.yaml
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dsme)
BuildRequires: pkgconfig(mce) >= 1.12.3

%description
This package contains C API for using IP Heartbeat service.
Expand Down Expand Up @@ -97,6 +100,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
/opt/tests/%{name}-tests/bin/hbtest
/opt/tests/%{name}-tests/bin/hbtest2
/opt/tests/%{name}-tests/bin/hbtest3
%doc COPYING
# >> files tests
# << files tests
4 changes: 4 additions & 0 deletions rpm/libiphb.yaml
Expand Up @@ -13,7 +13,10 @@ Sources:

PkgConfigBR:
- glib-2.0
- dbus-1
- dbus-glib-1
- dsme
- mce >= 1.12.3

UseAsNeeded: no

Expand All @@ -40,4 +43,5 @@ SubPackages:
Files:
- "/opt/tests/%{name}-tests/bin/hbtest"
- "/opt/tests/%{name}-tests/bin/hbtest2"
- "/opt/tests/%{name}-tests/bin/hbtest3"
- "%doc COPYING"
6 changes: 5 additions & 1 deletion tests/Makefile.am
Expand Up @@ -15,10 +15,14 @@ testbindir = /opt/tests/libiphb-tests/bin
#
# Build targets
#
testbin_PROGRAMS = hbtest hbtest2
testbin_PROGRAMS = hbtest hbtest2 hbtest3

hbtest_SOURCES = hbtest.c
hbtest_LDADD = ../src/libiphb.la

hbtest2_SOURCES = hbtest2.c
hbtest2_LDADD = ../src/libiphb.la

hbtest3_SOURCES = hbtest3.c
hbtest3_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(MCE_CFLAGS)
hbtest3_LDADD = ../src/libiphb.la $(DBUSGLIB_LIBS)

0 comments on commit 588da8e

Please sign in to comment.