From 8535255eda778d7739e2358b2dac12e94991afe3 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 9 Feb 2018 19:16:26 +0100 Subject: [PATCH] make tests pass in Koji --- libnice-0.1.14-tests-koji.patch | 36 +++++++++++++++++++++++++++++++++ libnice.spec | 5 +++++ 2 files changed, 41 insertions(+) create mode 100644 libnice-0.1.14-tests-koji.patch diff --git a/libnice-0.1.14-tests-koji.patch b/libnice-0.1.14-tests-koji.patch new file mode 100644 index 0000000..f9feb34 --- /dev/null +++ b/libnice-0.1.14-tests-koji.patch @@ -0,0 +1,36 @@ +From 527c30ba453753e75d3d31be29a277ea6adc17c0 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Fri, 9 Feb 2018 19:10:20 +0100 +Subject: [PATCH] tests: make the test-suite more verbose + +... and skip test-gstreamer if user's home is not /builddir (a heuristic +to detect mock) because multicast traffic is blocked on Koji buildhosts. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 16988ad..b7b74fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AC_CANONICAL_TARGET + + AC_CONFIG_SRCDIR([agent/agent.c]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([1.12 -Wall -Wno-portability subdir-objects]) ++AM_INIT_AUTOMAKE([1.12 -Wall -Wno-portability subdir-objects serial-tests]) + + AC_CONFIG_FILES([ + Makefile +@@ -262,7 +262,7 @@ AC_SUBST(gstplugindir) + AC_SUBST(gstplugin010dir) + + AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes) +-AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes) ++AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes -a "$HOME" != /builddir) + AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes) + + GUPNP_IGD_REQUIRED=0.2.4 +-- +2.13.6 + diff --git a/libnice.spec b/libnice.spec index e937514..f341e45 100644 --- a/libnice.spec +++ b/libnice.spec @@ -15,6 +15,9 @@ Patch1: libnice-0.1.14-70-gfb2f1f7.patch # make tests compile on i686 Patch2: libnice-0.1.14-tests-i686.patch +# make tests pass in Koji +Patch3: libnice-0.1.14-tests-koji.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: glib2-devel @@ -74,6 +77,7 @@ developing applications that use %{name}. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 # disable test-new-dribble that sometimes hangs indefinitely sed -e 's/test-new-dribble/#&/' -i tests/Makefile.am @@ -147,6 +151,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog * Fri Feb 09 2018 Kamil Dudka - 0.1.14-4.20171128gitfb2f1f7 +- make tests pass in Koji - disable test-new-dribble that sometimes hangs indefinitely - make tests compile on i686 - make the package build on armv7hl