From c482ee6020aab78f4dfde84f79c533850e2ff93a Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 6 Nov 2016 00:04:53 +0100
Subject: [PATCH] Introduce SKIP_IO_CAPTURE_TESTS group

to workaround false positives with some CI systems
---
 tests/output/sapi_windows_vt100_support_winko_err.phpt      | 3 +++
 tests/output/sapi_windows_vt100_support_winko_in-err.phpt   | 3 +++
 .../output/sapi_windows_vt100_support_winko_in-out-err.phpt | 3 +++
 tests/output/sapi_windows_vt100_support_winko_in-out.phpt   | 3 +++
 tests/output/sapi_windows_vt100_support_winko_out-err.phpt  | 3 +++
 tests/output/sapi_windows_vt100_support_winko_out.phpt      | 3 +++
 tests/output/sapi_windows_vt100_support_winok_err.phpt      | 3 +++
 tests/output/sapi_windows_vt100_support_winok_in-err.phpt   | 3 +++
 .../output/sapi_windows_vt100_support_winok_in-out-err.phpt | 3 +++
 tests/output/sapi_windows_vt100_support_winok_in-out.phpt   | 3 +++
 tests/output/sapi_windows_vt100_support_winok_out-err.phpt  | 3 +++
 tests/output/sapi_windows_vt100_support_winok_out.phpt      | 3 +++
 tests/output/stream_isatty_err.phpt                         | 6 ++++++
 tests/output/stream_isatty_in-err.phpt                      | 6 ++++++
 tests/output/stream_isatty_in-out-err.phpt                  | 6 ++++++
 tests/output/stream_isatty_in-out.phpt                      | 6 ++++++
 tests/output/stream_isatty_out-err.phpt                     | 6 ++++++
 tests/output/stream_isatty_out.phpt                         | 6 ++++++
 18 files changed, 72 insertions(+)

diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt
index c722e549be..4357c741af 100644
--- a/tests/output/sapi_windows_vt100_support_winko_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
index 0e8097eef6..fd508eedae 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
index 496f467df3..4af527f3d2 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/STDOUT/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
index da9a2378fe..18b64acaa6 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/STDOUT
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
index 94604bad0e..4fdf2dd5f9 100644
--- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt
index 563a3282cc..500cabcf9d 100644
--- a/tests/output/sapi_windows_vt100_support_winko_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt
index 58b3f6b35d..3113891661 100644
--- a/tests/output/sapi_windows_vt100_support_winok_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
index 4eda2c4534..4ca743fb46 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
index 62ed43c6a8..a8d9380140 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/STDOUT/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
index d146c5dc5c..17f90e5f55 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/STDOUT
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
index 223b0ddf3b..03e7d2c5ec 100644
--- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT/STDERR
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt
index 69cb508701..784a12d02c 100644
--- a/tests/output/sapi_windows_vt100_support_winok_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt
@@ -2,6 +2,9 @@
 Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
 if (stripos(PHP_OS, 'WIN') !== 0) {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
diff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt
index 65a45642cf..b071862c93 100644
--- a/tests/output/stream_isatty_err.phpt
+++ b/tests/output/stream_isatty_err.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDERR
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDERR
 --FILE--
diff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt
index b93ea03640..fac84efb57 100644
--- a/tests/output/stream_isatty_in-err.phpt
+++ b/tests/output/stream_isatty_in-err.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDIN/STDERR
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDIN STDERR
 --FILE--
diff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt
index 733d024b7e..56c49f70a8 100644
--- a/tests/output/stream_isatty_in-out-err.phpt
+++ b/tests/output/stream_isatty_in-out-err.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDIN/STDOUT/STDERR
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDIN STDOUT STDERR
 --FILE--
diff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt
index 755ee82d18..70f2c030f4 100644
--- a/tests/output/stream_isatty_in-out.phpt
+++ b/tests/output/stream_isatty_in-out.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDIN/STDOUT
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDIN STDOUT
 --FILE--
diff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt
index 97d804601b..4bd06d124d 100644
--- a/tests/output/stream_isatty_out-err.phpt
+++ b/tests/output/stream_isatty_out-err.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDOUT/STDERR
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDOUT STDERR
 --FILE--
diff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt
index ed592f12e1..14e1fb8607 100644
--- a/tests/output/stream_isatty_out.phpt
+++ b/tests/output/stream_isatty_out.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test stream_isatty with redirected STDOUT
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+	die("skip I/O capture test");
+}
+?>
 --CAPTURE_STDIO--
 STDOUT
 --FILE--
-- 
2.50.1