Skip to content

Commit d48d060

Browse files
committed
Update tests to contain better skipif reason
1 parent 6257823 commit d48d060

13 files changed

+18
-42
lines changed

package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
<file name="bug_gh_165.phpt" role="test" />
132132
<file name="rose.jpg" role="test" />
133133
<file name="skipif.inc" role="test" />
134+
<file name="skipif-czmq2.inc" role="test" />
134135
<file name="zeromq_test_helper.inc" role="test" />
135136
</dir>
136137
</dir>

tests/030-xrepmanualqueue.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Test send / recv with a manually created XREQ and XREP device
33
--SKIPIF--
44
<?php
55
require_once(dirname(__FILE__) . '/skipif.inc');
6-
if(!defined('ZMQ::SOCKOPT_RCVLABEL')) die('skip');
6+
if(!defined('ZMQ::SOCKOPT_RCVLABEL')) die('skip Only for in libzmq 3.3.0');
77
?>
88
--FILE--
99
<?php

tests/038-cert-construct.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ Test a ZMQCert can be constructed.
33
--SKIPIF--
44
<?php
55
require_once __DIR__ . '/skipif.inc';
6-
7-
if (!class_exists('ZMQCert')) {
8-
die('skip');
9-
}
6+
require_once __DIR__ . '/skipif-czmq2.inc';
107
--FILE--
118
<?php
129

tests/039-cert-equals.phpt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ Test two ZMQCerts can be tested for equality.
44
<?php
55

66
require_once __DIR__ . '/skipif.inc';
7+
require_once __DIR__ . '/skipif-czmq2.inc';
78

8-
if (!class_exists('ZMQCert')) {
9-
die('skip');
10-
}
11-
129
$cert = new ZMQCert();
1310
if ($cert->getPublicTxt() === str_repeat("0", 40)) {
1411
// This means no curve
15-
die("skip");
12+
die("skip No curve enabled in libczmq");
1613
}
1714
--FILE--
1815
<?php

tests/040-cert-clone.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ Test a ZMQCert can be cloned.
44
<?php
55

66
require_once __DIR__ . '/skipif.inc';
7-
8-
if (!class_exists('ZMQCert')) {
9-
die('skip');
10-
}
7+
require_once __DIR__ . '/skipif-czmq2.inc';
118
--FILE--
129
<?php
1310

tests/041-cert-meta.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ Test a ZMQCert can get and set metadata.
44
<?php
55

66
require_once __DIR__ . '/skipif.inc';
7-
8-
if (!class_exists('ZMQCert')) {
9-
die('skip');
10-
}
7+
require_once __DIR__ . '/skipif-czmq2.inc';
118
--FILE--
129
<?php
1310

tests/042-cert-save.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ Test a ZMQCert can be saved.
44
<?php
55

66
require_once __DIR__ . '/skipif.inc';
7-
8-
if (!class_exists('ZMQCert')) {
9-
die('skip');
10-
}
7+
require_once __DIR__ . '/skipif-czmq2.inc';
118
--FILE--
129
<?php
1310

tests/043-cert-load.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ Test a ZMQCert can be loaded.
44
<?php
55

66
require_once __DIR__ . '/skipif.inc';
7-
8-
if (! class_exists('ZMQCert')) {
9-
die('skip');
10-
}
7+
require_once __DIR__ . '/skipif-czmq2.inc';
118
--FILE--
129
<?php
1310

tests/044-auth-construct.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ Test a ZMQAuth can be constructed.
33
--SKIPIF--
44
<?php
55
require_once __DIR__ . '/skipif.inc';
6-
7-
if (!class_exists('ZMQAuth')) {
8-
die('skip');
9-
}
6+
require_once __DIR__ . '/skipif-czmq2.inc';
107
--FILE--
118
<?php
129

tests/045-auth-allow-deny.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ Test a ZMQAuth can whitelist or blacklist an IP address.
33
--SKIPIF--
44
<?php
55
require_once __DIR__ . '/skipif.inc';
6-
7-
if (!class_exists('ZMQAuth')) {
8-
die('skip');
9-
}
6+
require_once __DIR__ . '/skipif-czmq2.inc';
107
--FILE--
118
<?php
129

0 commit comments

Comments
 (0)