Skip to content

Commit aff0448

Browse files
committed
Drop superfluous readline test skip conditions
The `--EXTENSIONS--` section already ensures that ext/readline is available, so there's no need to additionally check for unconditionally available readline functions. Closes GH-17170.
1 parent 75410eb commit aff0448

7 files changed

+2
-13
lines changed

ext/readline/tests/bug69054.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
Bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
33
--EXTENSIONS--
44
readline
5-
--SKIPIF--
6-
<?php if (!function_exists('readline_add_history')) die("skip"); ?>
75
--INI--
86
open_basedir="{TMP}"
97
--FILE--

ext/readline/tests/libedit_write_history_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ readline_write_history(): Basic test
33
--EXTENSIONS--
44
readline
55
--SKIPIF--
6-
<?php if (!function_exists('readline_add_history')) die("skip");
6+
<?php
77
if (READLINE_LIB != "libedit") die("skip libedit only");
88
if (getenv('SKIP_REPEAT')) die("skip readline has global state");
99
?>

ext/readline/tests/readline_read_history_error_001.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Pedro Manoel Evangelista <pedro.evangelista at gmail dot com>
55
--EXTENSIONS--
66
readline
77
--SKIPIF--
8-
<?php if (!function_exists('readline_read_history')) die('skip readline_read_history function does not exist'); ?>
98
<?php if (!READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
109
--FILE--
1110
<?php

ext/readline/tests/readline_read_history_open_basedir_001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
readline_read_history(): Test that open_basedir is respected
33
--EXTENSIONS--
44
readline
5-
--SKIPIF--
6-
<?php if (!function_exists('readline_read_history')) die("skip"); ?>
75
--INI--
86
open_basedir=/tmp/some-sandbox
97
--FILE--

ext/readline/tests/readline_without_input.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ Jonathan Stevens <info at jonathanstevens dot be>
55
User Group: PHP-WVL & PHPGent #PHPTestFest
66
--EXTENSIONS--
77
readline
8-
--SKIPIF--
9-
<?php
10-
if (!function_exists('readline')) die("skip readline() not available");
11-
?>
128
--FILE--
139
<?php
1410
var_dump(readline());

ext/readline/tests/readline_write_history_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ readline_write_history(): Basic test
33
--EXTENSIONS--
44
readline
55
--SKIPIF--
6-
<?php if (!function_exists('readline_add_history')) die("skip");
6+
<?php
77
if (READLINE_LIB == "libedit") die("skip readline only");
88
if (getenv('SKIP_REPEAT')) die("skip readline has global state");
99
?>

ext/readline/tests/readline_write_history_open_basedir_001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
readline_write_history(): Test that open_basedir is respected
33
--EXTENSIONS--
44
readline
5-
--SKIPIF--
6-
<?php if (!function_exists('readline_write_history')) die("skip"); ?>
75
--INI--
86
open_basedir=/tmp/some-sandbox
97
--FILE--

0 commit comments

Comments
 (0)