main/spice: disable a test failing on s390x

2 files changed, 93 insertions, 4 deletions

diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index 6a0a570f78..d7dd797d8e 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice
 pkgver=0.14.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Implements the SPICE protocol"
 url="http://www.spice-space.org/"
 arch="all"
@@ -14,8 +14,9 @@ makedepends="$depends_dev alsa-lib-dev libjpeg-turbo-dev libxrandr-dev
 	py-six glib-dev opus-dev libressl-dev"
 subpackages="$pkgname-dev $pkgname-server"
 source="http://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2
-        libressl.patch
-       "
+	libressl.patch
+	disable-test-channel.patch
+	"
 builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
@@ -60,4 +61,5 @@ server() {
 }
 
 sha512sums="84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f  spice-0.14.0.tar.bz2
-f28b0afaec4a9d18be0d29979c43f40695d33dcb158129064aa2033489534f643ec380075e16de9d54fd4b266dbcebea55d028dd4ec6ace49c0b155d96e8f68a  libressl.patch"
+f28b0afaec4a9d18be0d29979c43f40695d33dcb158129064aa2033489534f643ec380075e16de9d54fd4b266dbcebea55d028dd4ec6ace49c0b155d96e8f68a  libressl.patch
+77d3600f17c7b64b7b8eca4440244fbe4198c8541be262dd7825925bab731b116f4483a07f4b1d5a2e3d3761caedfaded2f999f57596495b65d11af9390e8242  disable-test-channel.patch"
diff --git a/main/spice/disable-test-channel.patch b/main/spice/disable-test-channel.patch
new file mode 100644
index 0000000000..6fce9e4b7c
--- /dev/null
+++ b/main/spice/disable-test-channel.patch
@@ -0,0 +1,87 @@
+--- a/server/tests/Makefile.am
++++ b/server/tests/Makefile.am
+@@ -57,7 +57,6 @@
+ 	test-vdagent				\
+ 	test-fail-on-null-core-interface	\
+ 	test-empty-success			\
+-	test-channel				\
+ 	$(NULL)
+ 
+ noinst_PROGRAMS =				\
+--- a/server/tests/Makefile.in
++++ b/server/tests/Makefile.in
+@@ -95,7 +95,7 @@
+ 	test-qxl-parsing$(EXEEXT) test-stat-file$(EXEEXT) \
+ 	test-leaks$(EXEEXT) test-vdagent$(EXEEXT) \
+ 	test-fail-on-null-core-interface$(EXEEXT) \
+-	test-empty-success$(EXEEXT) test-channel$(EXEEXT) \
++	test-empty-success$(EXEEXT) \
+ 	$(am__EXEEXT_1)
+ noinst_PROGRAMS = test-display-no-ssl$(EXEEXT) \
+ 	test-display-streaming$(EXEEXT) \
+@@ -181,14 +181,6 @@
+ 	$(top_builddir)/server/libserver.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-test_channel_SOURCES = test-channel.c
+-test_channel_OBJECTS = test-channel.$(OBJEXT)
+-test_channel_LDADD = $(LDADD)
+-test_channel_DEPENDENCIES = libtest.a \
+-	$(top_builddir)/spice-common/common/libspice-common.la \
+-	$(top_builddir)/server/libserver.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ test_codecs_parsing_SOURCES = test-codecs-parsing.c
+ test_codecs_parsing_OBJECTS = test-codecs-parsing.$(OBJEXT)
+ test_codecs_parsing_LDADD = $(LDADD)
+@@ -383,7 +375,7 @@
+ SOURCES = $(libtest_stat1_a_SOURCES) $(libtest_stat2_a_SOURCES) \
+ 	$(libtest_stat3_a_SOURCES) $(libtest_stat4_a_SOURCES) \
+ 	$(libtest_a_SOURCES) $(spice_server_replay_SOURCES) \
+-	test-agent-msg-filter.c test-channel.c test-codecs-parsing.c \
++	test-agent-msg-filter.c test-codecs-parsing.c \
+ 	test-display-no-ssl.c test-display-resolution-changes.c \
+ 	test-display-streaming.c test-display-width-stride.c \
+ 	test-empty-success.c test-fail-on-null-core-interface.c \
+@@ -394,7 +386,7 @@
+ DIST_SOURCES = $(libtest_stat1_a_SOURCES) $(libtest_stat2_a_SOURCES) \
+ 	$(libtest_stat3_a_SOURCES) $(libtest_stat4_a_SOURCES) \
+ 	$(libtest_a_SOURCES) $(spice_server_replay_SOURCES) \
+-	test-agent-msg-filter.c test-channel.c test-codecs-parsing.c \
++	test-agent-msg-filter.c test-codecs-parsing.c \
+ 	test-display-no-ssl.c test-display-resolution-changes.c \
+ 	test-display-streaming.c test-display-width-stride.c \
+ 	test-empty-success.c test-fail-on-null-core-interface.c \
+@@ -982,10 +974,6 @@
+ 	@rm -f test-agent-msg-filter$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(test_agent_msg_filter_OBJECTS) $(test_agent_msg_filter_LDADD) $(LIBS)
+ 
+-test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) $(EXTRA_test_channel_DEPENDENCIES) 
+-	@rm -f test-channel$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(test_channel_OBJECTS) $(test_channel_LDADD) $(LIBS)
+-
+ test-codecs-parsing$(EXEEXT): $(test_codecs_parsing_OBJECTS) $(test_codecs_parsing_DEPENDENCIES) $(EXTRA_test_codecs_parsing_DEPENDENCIES) 
+ 	@rm -f test-codecs-parsing$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(test_codecs_parsing_OBJECTS) $(test_codecs_parsing_LDADD) $(LIBS)
+@@ -1077,7 +1065,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_stat4_a-stat-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replay.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-agent-msg-filter.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-channel.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-codecs-parsing.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-display-base.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-display-no-ssl.Po@am__quote@
+@@ -1473,13 +1460,6 @@
+ test-empty-success.log: test-empty-success$(EXEEXT)
+ 	@p='test-empty-success$(EXEEXT)'; \
+ 	b='test-empty-success'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-test-channel.log: test-channel$(EXEEXT)
+-	@p='test-channel$(EXEEXT)'; \
+-	b='test-channel'; \
+ 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \