Hello community,
here is the log from the commit of package libqb for openSUSE:Factory checked in at 2019-04-05 11:55:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqb (Old)
and /work/SRC/openSUSE:Factory/.libqb.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqb"
Fri Apr 5 11:55:08 2019 rev:27 rq:690890 version:1.0.3+20190326.a521604
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqb/libqb.changes 2019-02-13 10:17:56.005345098 +0100
+++ /work/SRC/openSUSE:Factory/.libqb.new.3908/libqb.changes 2019-04-05 11:55:09.718268408 +0200
@@ -1,0 +2,14 @@
+Tue Apr 2 16:48:36 UTC 2019 - Jan Engelhardt
+
+- Drop manual requires from libqb-tests.
+- Let libqb-devel depend on the exact package, libqb20 not just
+ a virtual libqb provide.
+- Drop redundant %if..%endif guards that do not affect the build.
+
+-------------------------------------------------------------------
+Tue Apr 2 09:17:01 UTC 2019 - Yan Gao
+
+- Update to version 1.0.3+20190326.a521604:
+- enable building / shipping of libqb-tests.rpm (bsc#1131328)
+
+-------------------------------------------------------------------
Old:
----
libqb-1.0.3+20190115.c880fcf.tar.xz
New:
----
libqb-1.0.3+20190326.a521604.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqb.spec ++++++
--- /var/tmp/diff_new_pack.DJkQIY/_old 2019-04-05 11:55:10.194268792 +0200
+++ /var/tmp/diff_new_pack.DJkQIY/_new 2019-04-05 11:55:10.194268792 +0200
@@ -12,14 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_without check
+%bcond_without testsrpm
Name: libqb
-Version: 1.0.3+20190115.c880fcf
+Version: 1.0.3+20190326.a521604
Release: 0
Summary: An IPC library for high performance servers
License: LGPL-2.1-or-later
@@ -48,7 +49,6 @@
%package -n libqb20
Summary: An IPC library for high performance servers
Group: System/Libraries
-Provides: %{name} = %{version}-%{release}
%description -n libqb20
libqb is a library providing high performance client server reusable
@@ -57,7 +57,7 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}-%{release}
+Requires: libqb20 = %{version}-%{release}
%description devel
libqb is a library providing high performance client server reusable
@@ -79,7 +79,11 @@
%build
./autogen.sh
-%configure --disable-static
+%configure \
+%if %{with testsrpm}
+ --enable-install-tests \
+%endif
+ --disable-static
make %{?_smp_mflags}
%if 0%{?with_check}
@@ -121,4 +125,17 @@
%{_sbindir}/qb-blackbox
%{_mandir}/man8/qb-blackbox.8.gz
+%package tests
+Summary: Test suite for %{name}
+Group: Development/Tools/Other
+
+%files tests
+%doc COPYING
+%dir %{_libdir}/libqb
+%dir %{_libdir}/libqb/tests
+%{_libdir}/libqb/tests/*
+
+%description tests
+The %{name}-tests package contains the %{name} test suite.
+
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.DJkQIY/_old 2019-04-05 11:55:10.238268827 +0200
+++ /var/tmp/diff_new_pack.DJkQIY/_new 2019-04-05 11:55:10.238268827 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/libqb.git</param>
- <param name="changesrevision">c880fcfd8d67d707c2de8bba5099230605f0f9bc</param>
+ <param name="changesrevision">a5216040d337521c1c8ae7bb7ceb1846c7042505</param>
</service>
</servicedata>
\ No newline at end of file
++++++ libqb-1.0.3+20190115.c880fcf.tar.xz -> libqb-1.0.3+20190326.a521604.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqb-1.0.3+20190115.c880fcf/Makefile.am new/libqb-1.0.3+20190326.a521604/Makefile.am
--- old/libqb-1.0.3+20190115.c880fcf/Makefile.am 2019-01-15 00:24:37.000000000 +0100
+++ new/libqb-1.0.3+20190326.a521604/Makefile.am 2019-03-26 12:31:05.000000000 +0100
@@ -37,9 +37,6 @@
ACLOCAL_AMFLAGS = -I m4
-# For test suite
-export SOCKETDIR
-
dist_doc_DATA = COPYING INSTALL README.markdown
SUBDIRS = include lib docs tools tests examples
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqb-1.0.3+20190115.c880fcf/configure.ac new/libqb-1.0.3+20190326.a521604/configure.ac
--- old/libqb-1.0.3+20190115.c880fcf/configure.ac 2019-01-15 00:24:37.000000000 +0100
+++ new/libqb-1.0.3+20190326.a521604/configure.ac 2019-03-26 12:31:05.000000000 +0100
@@ -557,6 +557,17 @@
[ FORCESOCKETSFILE="$withval" ],
[ FORCESOCKETSFILE="$sysconfdir/libqb/force-filesystem-sockets" ])
+AC_ARG_ENABLE([install-tests],
+ [AS_HELP_STRING([--enable-install-tests],[install tests])],,
+ [ enable_install_tests="no" ])
+AM_CONDITIONAL([INSTALL_TESTS], [test x$enable_install_tests = xyes])
+
+AC_ARG_WITH([testdir],
+ [AS_HELP_STRING([--with-testdir=DIR],[path to /usr/lib../libqb/tests/ dir where to install the test suite])],
+ [ TESTDIR="$withval" ],
+ [ TESTDIR="$libdir/libqb/tests" ])
+AC_SUBST([TESTDIR])
+
AC_SUBST(CP)
# *FLAGS handling goes here
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqb-1.0.3+20190115.c880fcf/libqb.spec.in new/libqb-1.0.3+20190326.a521604/libqb.spec.in
--- old/libqb-1.0.3+20190115.c880fcf/libqb.spec.in 2019-01-15 00:24:37.000000000 +0100
+++ new/libqb-1.0.3+20190326.a521604/libqb.spec.in 2019-03-26 12:31:05.000000000 +0100
@@ -1,4 +1,5 @@
%bcond_without check
+%bcond_without testsrpm
%global alphatag @alphatag@
%global numcomm @numcomm@
@@ -26,7 +27,11 @@
%build
./autogen.sh
-%configure --disable-static
+%configure \
+%if %{with testsrpm}
+ --enable-install-tests \
+%endif
+ --disable-static
make %{?_smp_mflags}
%if 0%{?with_check}
@@ -66,6 +71,20 @@
%{_libdir}/pkgconfig/libqb.pc
%{_mandir}/man3/qb*3*
+%if %{with testsrpm}
+%package tests
+Summary: Test suite for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%files tests
+%doc COPYING
+%{_libdir}/libqb/tests/*
+
+%description tests
+The %{name}-tests package contains the %{name} test suite.
+%endif
+
%changelog
* @date@ Autotools generated version - @version@-1-@numcomm@.@alphatag@.@dirty@
- Autotools generated version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqb-1.0.3+20190115.c880fcf/tests/Makefile.am new/libqb-1.0.3+20190326.a521604/tests/Makefile.am
--- old/libqb-1.0.3+20190115.c880fcf/tests/Makefile.am 2019-01-15 00:24:37.000000000 +0100
+++ new/libqb-1.0.3+20190326.a521604/tests/Makefile.am 2019-03-26 12:31:05.000000000 +0100
@@ -21,10 +21,13 @@
EXTRA_DIST =
CLEANFILES =
+export SOCKETDIR
+
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_PROGRAMS = bmc bmcpt bms rbreader rbwriter \
- bench-log format_compare_speed loop print_ver
+ bench-log format_compare_speed loop print_ver \
+ $(check_PROGRAMS)
noinst_HEADERS = check_common.h
@@ -115,6 +118,7 @@
EXTRA_DIST += blackbox-segfault.sh
TESTS = start.test array.test map.test rb.test list.test log.test blackbox-segfault.sh loop.test ipc.test resources.test
+TESTS_ENVIRONMENT = export PATH=.:../tools:$$PATH;
resources.log: rb.log log.log ipc.log
@@ -129,6 +133,12 @@
check_PROGRAMS += util.test
endif
+if INSTALL_TESTS
+testsuitedir = $(TESTDIR)
+testsuite_PROGRAMS = $(check_PROGRAMS)
+testsuite_SCRIPTS = $(dist_check_SCRIPTS) test.conf
+endif
+
file_change_bytes_SOURCES = file_change_bytes.c
crash_test_dummy_SOURCES = crash_test_dummy.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqb-1.0.3+20190115.c880fcf/tests/blackbox-segfault.sh new/libqb-1.0.3+20190326.a521604/tests/blackbox-segfault.sh
--- old/libqb-1.0.3+20190115.c880fcf/tests/blackbox-segfault.sh 2019-01-15 00:24:37.000000000 +0100
+++ new/libqb-1.0.3+20190326.a521604/tests/blackbox-segfault.sh 2019-03-26 12:31:05.000000000 +0100
@@ -1,26 +1,34 @@
#!/bin/sh
#
+# Needs PATH to be set to find accompanying test programs
+# - including qb-blackbox which for in-tree tests should be
+# - in ../tools
+#
# create a normal blackbox
+#
+
+#
+# create a normal blackbox
+#
rm -f crash-test-dummy.fdata
-./crash_test_dummy
+crash_test_dummy
rm -f core*
-. ./test.conf
+. test.conf
# first test that reading the valid
# blackbox data actually works.
-../tools/qb-blackbox crash-test-dummy.fdata
+qb-blackbox crash-test-dummy.fdata
if [ $? -ne 0 ]; then
exit 1
fi
-
for i in $(seq $NUM_BB_TESTS)
do
rm -f butchered_blackbox.fdata
echo " ==== Corrupt blackbox test $i/$NUM_BB_TESTS ===="
- ./file_change_bytes -i crash-test-dummy.fdata -o butchered_blackbox.fdata -n 1024
- ../tools/qb-blackbox butchered_blackbox.fdata
+ file_change_bytes -i crash-test-dummy.fdata -o butchered_blackbox.fdata -n 1024
+ qb-blackbox butchered_blackbox.fdata
[ $? -gt 127 ] && exit 1 || true
done