Skip to content

Commit 95c6e1a

Browse files
committed
Backport skipif.inc and tests memc_get_version from master / php7 branch
According to memcached wiki, touch is added since 1.4.8 https://github.com/memcached/memcached/wiki/ReleaseNotes148
1 parent a46d48c commit 95c6e1a

File tree

6 files changed

+38
-7
lines changed

6 files changed

+38
-7
lines changed

tests/config.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,8 @@ function memc_create_combinations ($name, $serializer, $ignore_object_type = fal
6464
),
6565
);
6666
}
67+
68+
function memc_get_version($memc, $host = '') {
69+
$version = $memc->getVersion();
70+
return array_pop($version);
71+
}

tests/expire.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Memcached store, fetch & touch expired key
33
--XFAIL--
44
https://code.google.com/p/memcached/issues/detail?id=275
55
--SKIPIF--
6-
<?php if (!extension_loaded("memcached")) print "skip";
6+
<?php
7+
$min_version = "1.4.8";
8+
include dirname(__FILE__) . "/skipif.inc";
79
if (!method_exists("memcached", "touch")) die ("skip memcached::touch is not available");
810
?>
911
--FILE--

tests/gh_155.phpt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
--TEST--
22
Test for bug 155
33
--SKIPIF--
4-
<?php if (!extension_loaded("memcached")) print "skip"; ?>
4+
<?php
5+
$min_version = "1.4.8";
6+
include dirname(__FILE__) . "/skipif.inc";
7+
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
8+
?>
59
--FILE--
610
<?php
711
include dirname (__FILE__) . '/config.inc';
@@ -38,4 +42,4 @@ TOUCH: SUCCESS
3842
TOUCH: SUCCESS
3943
GET: SUCCESS
4044
GET: SUCCESS
41-
DONE
45+
DONE

tests/gh_77.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
Test for Github issue #77
33
--SKIPIF--
4-
<?php if (!extension_loaded("memcached")) print "skip";
5-
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
4+
<?php
5+
$min_version = "1.4.8";
6+
include dirname(__FILE__) . "/skipif.inc";
7+
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
68
?>
79
--FILE--
810
<?php

tests/skipif.inc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
if (!extension_loaded("memcached")) {
3+
die("skip memcached is not loaded\n");
4+
}
5+
6+
include dirname(__FILE__) . "/config.inc";
7+
8+
if (($m = memc_get_instance()) === NULL) {
9+
die ("skip can not connect to server\n");
10+
}
11+
12+
if (isset($min_version)) {
13+
if (version_compare(memc_get_version($m), $min_version, "<")) {
14+
die("skip version of server pool is too old, $min_version is required\n");
15+
}
16+
}

tests/touch_binary.phpt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
--TEST--
22
Touch in binary mode
33
--SKIPIF--
4-
<?php if (!extension_loaded("memcached")) print "skip";
5-
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
4+
<?php
5+
$min_version = "1.4.8"; //TOUCH is added since 1.4.8
6+
include dirname(__FILE__) . "/skipif.inc";
7+
if (Memcached::LIBMEMCACHED_VERSION_HEX < 0x01000016) die ('skip too old libmemcached');
68
?>
79
--FILE--
810
<?php

0 commit comments

Comments
 (0)