summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-10-10 21:24:15 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-10-10 21:24:15 (GMT)
commit7d1b223f7df36d45707d0c6325c3c5665b324724 (patch)
treee4b38db7d276fc5a82b430b7725a97451b084ec4
parent43a91548b31101b95bc2b2e29ada872bb3d9590e (diff)
downloadtcl-7d1b223f7df36d45707d0c6325c3c5665b324724.zip
tcl-7d1b223f7df36d45707d0c6325c3c5665b324724.tar.gz
tcl-7d1b223f7df36d45707d0c6325c3c5665b324724.tar.bz2
[98c8b3ec12] Use constraint to work around failing test; it's just a bug in the
underlying library, and one that appears fixed in later versions. Not our fault if some OSes don't update. (It's also in a very esoteric spot.)
-rw-r--r--tests/zlib.test9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/zlib.test b/tests/zlib.test
index 0712929..4e51ebb 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -16,6 +16,13 @@ if {"::tcltest" ni [namespace children]} {
}
testConstraint zlib [llength [info commands zlib]]
+testConstraint recentZlib 0
+catch {
+ # Work around a bug in some versions of zlib; known to manifest on at
+ # least Mac OS X Mountain Lion...
+ testConstraint recentZlib \
+ [package vsatisfies [zlib::pkgconfig get zlibVersion] 1.2.6]
+}
test zlib-1.1 {zlib basics} -constraints zlib -returnCodes error -body {
zlib
@@ -269,7 +276,7 @@ test zlib-8.9 {transformation and fconfigure} -setup {
} -result {3064818174 358 358}
test zlib-8.10 {transformation and fconfigure} -setup {
lassign [chan pipe] inSide outSide
-} -constraints zlib -body {
+} -constraints {zlib recentZlib} -body {
zlib push deflate $outSide -dictionary $spdyDict
fconfigure $outSide -blocking 0 -translation binary -buffering none
fconfigure $inSide -blocking 0 -translation binary