patch testsuite on s390x for rawformat (#2045430)
https://github.com/haskell/zlib/issues/46 seems modern z15 uses native compression instruction
This commit is contained in:
parent
b36bf697fd
commit
fda84dfe6d
@ -16,6 +16,8 @@ Url: https://hackage.haskell.org/package/%{pkg_name}
|
|||||||
# Begin cabal-rpm sources:
|
# Begin cabal-rpm sources:
|
||||||
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
||||||
# End cabal-rpm sources
|
# End cabal-rpm sources
|
||||||
|
# https://github.com/haskell/zlib/issues/46
|
||||||
|
Patch0: zlib-0.6.2.3-test-rawformat-s390x-z15.patch
|
||||||
|
|
||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
@ -83,6 +85,9 @@ This package provides the Haskell %{pkg_name} profiling library.
|
|||||||
%prep
|
%prep
|
||||||
# Begin cabal-rpm setup:
|
# Begin cabal-rpm setup:
|
||||||
%setup -q -n %{pkgver}
|
%setup -q -n %{pkgver}
|
||||||
|
%ifarch s390x
|
||||||
|
%patch0 -p1 -b.orig
|
||||||
|
%endif
|
||||||
# End cabal-rpm setup
|
# End cabal-rpm setup
|
||||||
#remove the copy library
|
#remove the copy library
|
||||||
rm -r cbits
|
rm -r cbits
|
||||||
|
11
zlib-0.6.2.3-test-rawformat-s390x-z15.patch
Normal file
11
zlib-0.6.2.3-test-rawformat-s390x-z15.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- zlib-0.6.2.3/test/Test.hs~ 2001-09-09 09:46:40.000000000 +0800
|
||||||
|
+++ zlib-0.6.2.3/test/Test.hs 2022-03-12 13:04:22.643542774 +0800
|
||||||
|
@@ -190,7 +190,7 @@
|
||||||
|
let decomp = decompressIO rawFormat defaultDecompressParams
|
||||||
|
err <- assertDecompressError hnd decomp
|
||||||
|
msg <- assertDataFormatError err
|
||||||
|
- msg @?= "invalid code lengths set"
|
||||||
|
+ msg @?= "Operation-Ending-Supplemental Code is 0x27"
|
||||||
|
|
||||||
|
withSampleData "not-gzip" $ \hnd -> do
|
||||||
|
let decomp = decompressIO gzipOrZlibFormat defaultDecompressParams
|
Loading…
Reference in New Issue
Block a user