Skip to content

Commit 800927f

Browse files
committed
Move skipif out of skipif.inc
This skip condition does not apply to all stream tests
1 parent 7afae3c commit 800927f

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

ext/standard/tests/streams/proc_open_bug51800.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
Bug #51800 proc_open on Windows hangs forever
33
--SKIPIF--
44
<?php
5-
echo 'skip expected to fail or take too long';
6-
if (getenv("SKIP_SLOW_TESTS")) {
7-
die("skip slow test");
8-
}
9-
require_once __DIR__ . 'skipif.inc';
5+
echo 'skip expected to fail or take too long';
6+
if (getenv("SKIP_SLOW_TESTS")) {
7+
die("skip slow test");
8+
}
9+
if (strpos(PHP_OS, 'FreeBSD') !== false) {
10+
die("skip for FreeBSD");
11+
}
1012
?>
1113
--XFAIL--
1214
pipes have to be read/written simultaneously

ext/standard/tests/streams/proc_open_bug51800_right.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
--TEST--
22
Bug #51800 proc_open on Windows hangs forever, the right way to do it
33
--SKIPIF--
4-
<?php include 'skipif.inc'; ?>
4+
<?php
5+
if (strpos(PHP_OS, 'FreeBSD') !== false) {
6+
die("skip for FreeBSD");
7+
}
8+
?>
59
--FILE--
610
<?php
711
$callee = __DIR__ . "/process_proc_open_bug51800_right.php";

ext/standard/tests/streams/skipif.inc

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)