summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-08-24 19:41:04 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-08-24 19:41:04 (GMT)
commit8acd334a1e6c5bad786a058d93708d28c6c5fdf6 (patch)
tree4546e733113b70d562c773cb3f159bb416d21db3
parent1d2aea3dd1418f7c5df97052cd49798a19de43b7 (diff)
parentc94c6dbf270da53310d7dddcc01be1b527ce526b (diff)
downloadtk-8acd334a1e6c5bad786a058d93708d28c6c5fdf6.zip
tk-8acd334a1e6c5bad786a058d93708d28c6c5fdf6.tar.gz
tk-8acd334a1e6c5bad786a058d93708d28c6c5fdf6.tar.bz2
Fix [cc42cc18a5]: Prevent the test suite from crashing when running tests imgPhoto-18.* in case the host machine runs out of memory and the memory allocation error is not returned (e.g. on FreeBSD 11.1)
-rw-r--r--tests/corruptMangled.gifbin64 -> 64 bytes
-rw-r--r--tests/imgPhoto.test26
2 files changed, 21 insertions, 5 deletions
diff --git a/tests/corruptMangled.gif b/tests/corruptMangled.gif
index ce043f0..9c1637c 100644
--- a/tests/corruptMangled.gif
+++ b/tests/corruptMangled.gif
Binary files differ
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 4f3611e..4bff5cc 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -1256,7 +1256,7 @@ test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
} -setup {
package require base64
set data [base64::decode {
- R0lGODlhwjMz//8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
+ R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
5qpraXIvM1JlNyAgOw==
}]
} -body {
@@ -1266,7 +1266,7 @@ test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -setup {
set data {
- R0lGODlhwjMz//8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
+ R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
5qpraXIvM1JlNyAgOw==
}
} -body {
@@ -1310,8 +1310,12 @@ test imgPhoto-18.6 {Reject truncated GIF (file)} -setup {
catch {image delete gif1}
} -returnCodes error -result {error reading color map}
test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
- base64PackageNeeded
+ base64PackageNeeded nonPortable
} -setup {
+ # About the non portability constraint of this test: see ticket [cc42cc18a5]
+ # If there is insufficient memory, the error message
+ # {not enough free memory for image buffer} should be returned.
+ # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
package require base64
set data [base64::decode {
R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
@@ -1322,7 +1326,13 @@ test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -setup {
+test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints {
+ nonPortable
+} -setup {
+ # About the non portability constraint of this test: see ticket [cc42cc18a5]
+ # If there is insufficient memory, the error message
+ # {not enough free memory for image buffer} should be returned.
+ # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
set data {
R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
@@ -1332,7 +1342,13 @@ test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -setup {
} -cleanup {
catch {image delete gif1}
} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -setup {
+test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
+ nonPortable
+} -setup {
+ # About the non portability constraint of this test: see ticket [cc42cc18a5]
+ # If there is insufficient memory, the error message
+ # {not enough free memory for image buffer} should be returned.
+ # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
set fileName [file join [file dirname [info script]] corruptMangled4G.gif]
} -body {
image create photo gif1 -file $fileName