Package: mbuffer Version: 20171011-1 Severity: minor Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch autopkgtest
Dear Peter, With mbuffer 20171011-1, while the autopkgtests continue to pass fine on amd64 as seen at <https://ci.debian.net/packages/m/mbuffer/unstable/amd64/>, one of the tests fails on armhf and i386 as seen in Ubuntu at <http://autopkgtest.ubuntu.com/packages/m/mbuffer/bionic/armhf>. I don't understand why the filename output of the tests is different on armhf and i386 vs. other architectures, but I can confirm that a slight change to the globbing in the test itself allows the test to pass. The attached patch has been uploaded to Ubuntu to fix this test failure. Please consider applying this change in Debian as well. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru mbuffer-20171011/debian/patches/fix-upstream-test.patch mbuffer-20171011/debian/patches/fix-upstream-test.patch --- mbuffer-20171011/debian/patches/fix-upstream-test.patch 1969-12-31 16:00:00.000000000 -0800 +++ mbuffer-20171011/debian/patches/fix-upstream-test.patch 2018-03-18 22:43:08.000000000 -0700 @@ -0,0 +1,33 @@ +Description: fix a test case whose file glob fails on some archs + For whatever reason, on armhf and i386, mbuffer outputs a single file named + 'output-test4' or 'output-test5' in its tests, whereas on other archs it + outputs multiple files matching the pattern "output-testN.*". This is not + the purpose of the test, and tests 4 and 5 in fact handle the output + filenames inconsistently; so fix the test so that it works on all archs. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Last-Updated: 2018-03-18 + +Index: mbuffer-20171011/Makefile.in +=================================================================== +--- mbuffer-20171011.orig/Makefile.in ++++ mbuffer-20171011/Makefile.in +@@ -118,7 +118,7 @@ + rm -f output-$@.tar.* + cat mbuffer | LD_PRELOAD=./tapetest.so ./mbuffer -f -o output-$@ -H -A "echo '[$@] Replacing tape'" + cat output-$@* | openssl md5 > $@.md5 +- rm -f output-$@.* ++ rm -f output-$@* + sync + diff $@.md5 mbuffer.md5 > $@ + +@@ -126,8 +126,8 @@ + test5: test.md5 tapetest.so mbuffer.md5 + rm -f output-$@.tar.* + cat mbuffer | LD_PRELOAD=./tapetest.so ./mbuffer -f -o output-$@ -H -A "echo '[$@] Replacing tape'" --tapeaware +- cat output-$@.* | openssl md5 > $@.md5 +- rm -f output-$@.* ++ cat output-$@* | openssl md5 > $@.md5 ++ rm -f output-$@* + sync + diff $@.md5 mbuffer.md5 > $@ + diff -Nru mbuffer-20171011/debian/patches/series mbuffer-20171011/debian/patches/series --- mbuffer-20171011/debian/patches/series 2017-10-29 13:12:08.000000000 -0700 +++ mbuffer-20171011/debian/patches/series 2018-03-18 22:38:13.000000000 -0700 @@ -5,3 +5,4 @@ close-errno.patch test-library.patch config-mbuffer.patch +fix-upstream-test.patch
