zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix giflib unit tests on macOS/BSD (#7519)

Browse Source 
* Fix giflib unit tests on macOS/BSD

* Unit tests occasionally fail when run in parallel
This commit is contained in:
Adam J. Stewart 2018-03-22 19:38:17 -05:00 committed by GitHub
parent f721fb3e4c
commit 1f23693877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/giflib/bsd-head.patch Normal file
View File

@ -0,0 +1,19 @@
The BSD version of head does not accept the --bytes option,
nor does it accept negative integers. Use dd instead for
BSD support.
--- a/tests/makefile 2014-05-16 05:46:53.000000000 -0500
+++ b/tests/makefile 2018-03-18 18:29:47.000000000 -0500
@@ -103,10 +103,10 @@
giffix-rebuild:
@echo "Rebuilding giffix test."
- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
+ @dd if=$(PICS)/treescap.gif bs=1 count=387 | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
giffix-regress:
@echo "giffix: Testing giffix behavior"
- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico -
+ @dd if=$(PICS)/treescap.gif bs=1 count=387 | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico -
gifinto-regress:
@echo "gifinto: Checking behavior on short files."

5
var/spack/repos/builtin/packages/giflib/package.py
View File

@ -33,3 +33,8 @@ class Giflib(AutotoolsPackage):
url = "https://downloads.sourceforge.net/project/giflib/giflib-5.1.4.tar.bz2"
version('5.1.4', '2c171ced93c0e83bb09e6ccad8e3ba2b')
patch('bsd-head.patch')
def check(self):
make('check', parallel=False)