Skip to content

Commit de487ff

Browse files
committed
Tweak test, skip instead of FAIL.
1 parent dc47bf7 commit de487ff

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

tests/experimental/serializer/serializer_php_bad_serialize.phpt

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
--TEST--
22
Serializer: exception while serializing
3-
--XFAIL--
43
--SKIPIF--
5-
<?php if (!extension_loaded("memcached")) print "skip"; ?>
4+
<?php
5+
if (!extension_loaded("memcached")) print "skip";
6+
if ($_ENV['TEST_MEMC_SERIALIZER'] == 'Memcached::SERIALIZER_JSON') {
7+
echo "skip skip when using JSON";
8+
}
9+
if ($_ENV['TEST_MEMC_SERIALIZER'] == 'Memcached::SERIALIZER_PHP' ||
10+
!isset($_ENV['TEST_MEMC_SERIALIZER'])) {
11+
echo "skip skip when using PHP internal";
12+
}
613
--FILE--
714
<?php
815
class Foo {

tests/experimental/serializer/serializer_php_bad_unserialize.phpt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
--TEST--
22
Serializer: exception while unserializing
33
--SKIPIF--
4-
<?php if (!extension_loaded("memcached")) print "skip"; ?>
4+
<?php
5+
if (!extension_loaded("memcached")) print "skip";
6+
if ($_ENV['TEST_MEMC_SERIALIZER'] == 'Memcached::SERIALIZER_JSON') {
7+
echo "skip skip when using JSON";
8+
}
59
--FILE--
610
<?php
711
class Foo implements Serializable {

tests/experimental/set_badserialize.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
--TEST--
22
Memcached::set() with bad serialize
33
--SKIPIF--
4-
--XFAIL--
54
<?php if (!extension_loaded("memcached")) print "skip"; ?>
65
--FILE--
76
<?php

tests/experimental/setmulti_badserialize.phpt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
--TEST--
22
Memcached::setMultiByKey() with bad serialize
3-
--XFAIL--
43
--SKIPIF--
54
<?php if (!extension_loaded("memcached")) print "skip"; ?>
65
--FILE--

0 commit comments

Comments
 (0)