Source tree changes

Separate test source to tests directory and change library source directory from iphb to src. Install test binaries under /opt/tests. [source] Separate test code to own directory Signed-off-by: Matti Kosola <matti.kosola@jollamobile.com>
sailfishos · May 30, 2013 · 31b57ff · 31b57ff
1 parent 9e3fba1
commit 31b57ff
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,9 +44,9 @@ debian/libiphb0.postinst.debhelper
 debian/libiphb0.postrm.debhelper
 debian/tmp/
 
-iphbd/hbtest
-iphbd/hbtest2
-iphbd/libiphb.pc
-iphbd/libiphb-uninstalled.pc
+tests/hbtest
+tests/hbtest2
+src/libiphb.pc
+src/libiphb-uninstalled.pc
 
 m4/
diff --git a/Makefile.am b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = iphbd
+SUBDIRS = src tests
diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(libiphb, 1.0.0)
 AM_INIT_AUTOMAKE
 
 AC_PREREQ([2.61])
-AC_CONFIG_SRCDIR([iphbd/libiphb.c])
+AC_CONFIG_SRCDIR([src/libiphb.c])
 
 # NOTE: Must the LT version must be changed when code is released:
 #  - If interfaces changed/added/removed: lt_current++, lt_rev=0
@@ -60,8 +60,9 @@ AC_CHECK_FUNCS([inet_ntoa memset select socket strerror])
 
 # Create files
 AC_CONFIG_FILES([Makefile
-                 iphbd/Makefile
-                 iphbd/libiphb-uninstalled.pc
-                 iphbd/libiphb.pc])
+                 src/Makefile
+                 src/libiphb-uninstalled.pc
+                 src/libiphb.pc
+                 tests/Makefile])
 
 AC_OUTPUT
diff --git a/rpm/libiphb.spec b/rpm/libiphb.spec
@@ -13,7 +13,7 @@ Version:    1.0.0
 Release:    0
 Group:      System/System Control
 License:    LGPLv2+
-URL:        http://meego.gitorious.org/meego-middleware/libiphb
+URL:        http://github.com/nemomobile/libiphb
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  libiphb.yaml
 Requires(post): /sbin/ldconfig
@@ -34,13 +34,13 @@ Requires:   %{name} = %{version}-%{release}
 This package contains C headers for the IP Heartbeat API.
 
 
-%package test
-Summary:    Test tool for IP Heartbeat service
+%package tests
+Summary:    Tests package for IP Heartbeat service
 Group:      Development/Tools
 Requires:   %{name} = %{version}-%{release}
 
-%description test
-Command line utility to test IP Heartbeat functionality.
+%description tests
+Tests package to test IP Heartbeat functionality.
 
 
 %prep
@@ -93,10 +93,10 @@ rm -rf %{buildroot}
 # >> files devel
 # << files devel
 
-%files test
+%files tests
 %defattr(-,root,root,-)
-%{_bindir}/hbtest
-%{_bindir}/hbtest2
+/opt/tests/%{name}-tests/bin/hbtest
+/opt/tests/%{name}-tests/bin/hbtest2
 %doc COPYING
-# >> files test
-# << files test
+# >> files tests
+# << files tests
diff --git a/rpm/libiphb.yaml b/rpm/libiphb.yaml
@@ -4,7 +4,7 @@ Version: 1.0.0
 Release: 0
 Group: System/System Control
 License: LGPLv2+
-URL: http://meego.gitorious.org/meego-middleware/libiphb
+URL: http://github.com/nemomobile/libiphb
 Description: |
     This package contains C API for using IP Heartbeat service.
 
@@ -32,12 +32,12 @@ SubPackages:
           - "%{_libdir}/libiphb.so"
           - "%{_libdir}/pkgconfig/libiphb.pc"
           - "%doc COPYING"
-    - Name: test
+    - Name: tests
       Group: Development/Tools
-      Summary: Test tool for IP Heartbeat service
+      Summary: Tests package for IP Heartbeat service
       Description: |
-        Command line utility to test IP Heartbeat functionality.
+        Tests package to test IP Heartbeat functionality.
       Files:
-          - "%{_bindir}/hbtest"
-          - "%{_bindir}/hbtest2"
+          - "/opt/tests/%{name}-tests/bin/hbtest"
+          - "/opt/tests/%{name}-tests/bin/hbtest2"
           - "%doc COPYING"
diff --git a/iphbd/Makefile.am → src/Makefile.am b/iphbd/Makefile.am → src/Makefile.am
@@ -15,16 +15,8 @@ iphbdincludedir = @includedir@/iphbd
 #
 # Build targets
 #
-bin_PROGRAMS = hbtest hbtest2
 lib_LTLIBRARIES = libiphb.la
 
-hbtest_SOURCES = hbtest.c
-hbtest_LDADD = libiphb.la
-
-
-hbtest2_SOURCES = hbtest2.c
-hbtest2_LDADD = libiphb.la
-
 libiphb_la_SOURCES = libiphb.c
 libiphb_la_LDFLAGS = $(AM_LDFLAGS) -shared -version-info $(IPHB_LT_VERSION)
 

diff --git a/iphbd/depend_filter.py → src/depend_filter.py b/iphbd/depend_filter.py → src/depend_filter.py
diff --git a/iphbd/iphb_internal.h → src/iphb_internal.h b/iphbd/iphb_internal.h → src/iphb_internal.h
diff --git a/iphbd/libiphb-uninstalled.pc.in → src/libiphb-uninstalled.pc.in b/iphbd/libiphb-uninstalled.pc.in → src/libiphb-uninstalled.pc.in
diff --git a/iphbd/libiphb.c → src/libiphb.c b/iphbd/libiphb.c → src/libiphb.c
diff --git a/iphbd/libiphb.h → src/libiphb.h b/iphbd/libiphb.h → src/libiphb.h
diff --git a/iphbd/libiphb.pc.in → src/libiphb.pc.in b/iphbd/libiphb.pc.in → src/libiphb.pc.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Generic options
+#
+AM_CFLAGS = -Wall -Wmissing-prototypes -std=c99 -Os -g -fPIC
+AM_CPPFLAGS = -D_GNU_SOURCE
+AM_LDFLAGS = -g -lrt -Wl,--as-needed
+
+ACLOCAL_AMFLAGS = -I m4
+
+#
+# Additional dirs
+#
+testbindir = /opt/tests/libiphb-tests/bin
+
+#
+# Build targets
+#
+testbin_PROGRAMS = hbtest hbtest2
+
+hbtest_SOURCES = hbtest.c
+hbtest_LDADD = ../src/libiphb.la
+
+hbtest2_SOURCES = hbtest2.c
+hbtest2_LDADD = ../src/libiphb.la
diff --git a/iphbd/hbtest.c → tests/hbtest.c b/iphbd/hbtest.c → tests/hbtest.c
@@ -62,7 +62,7 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 
-#include "libiphb.h"
+#include "../src/libiphb.h"
 
 static volatile int run = 1;
 

diff --git a/iphbd/hbtest2.c → tests/hbtest2.c b/iphbd/hbtest2.c → tests/hbtest2.c
@@ -45,7 +45,7 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 
-#include "libiphb.h"
+#include "../src/libiphb.h"
 
 static volatile int run = 1;