Remove checks for always enabled spl and pcre

Closes GH-4397

diff --git a/ext/spl/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt
index 724576d3bc0cc87506a818a0edb4c0be2cd52fa8..fd3bbf43e5d4b7d515683ee2ae7775db86791021 100644 (file)
--- a/ext/spl/tests/bug70868.phpt
+++ b/ext/spl/tests/bug70868.phpt
@@ -2,8 +2,6 @@
 Bug #70868, with PCRE JIT
 --INI--
 pcre.jit=1
---SKIPIF--
-<?php if (!extension_loaded("pcre")) die("skip"); ?>
 --FILE--
 <?php
 

diff --git a/ext/standard/tests/general_functions/bug44295-win.phpt b/ext/standard/tests/general_functions/bug44295-win.phpt
index 222b7beda7e32297dda8b7f71286b726e8ee5bff..13a8918bcd3fcbc341d37d14d43e597d1b9a6cf8 100644 (file)
--- a/ext/standard/tests/general_functions/bug44295-win.phpt
+++ b/ext/standard/tests/general_functions/bug44295-win.phpt
@@ -2,8 +2,8 @@
 user defined error handler + set_error_handling(EH_THROW)
 --SKIPIF--
 <?php
-       if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only");
-       if (!extension_loaded("spl") || is_dir('c:\\not\\exists\\here')) die("skip");
+if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only");
+if (is_dir('c:\\not\\exists\\here')) die("skip directory c:\\not\\exists\\here already exists");
 ?>
 --FILE--
 <?php

diff --git a/ext/standard/tests/general_functions/bug44295.phpt b/ext/standard/tests/general_functions/bug44295.phpt
index a184719193ed946c56e3d894453713163138d8c8..c9744e64dd644df6ec7a48107f8ca7a48d7eae23 100644 (file)
--- a/ext/standard/tests/general_functions/bug44295.phpt
+++ b/ext/standard/tests/general_functions/bug44295.phpt
@@ -2,8 +2,8 @@
 user defined error handler + set_error_handling(EH_THROW)
 --SKIPIF--
 <?php
-       if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
-       if (!extension_loaded("spl") || is_dir('/this/path/does/not/exist')) die("skip");
+if (substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
+if (is_dir('/this/path/does/not/exist')) die("skip directory /this/path/does/not/exist already exists");
 ?>
 --FILE--
 <?php

diff --git a/run-tests.php b/run-tests.php
index d83669b706c01d326b6f8ea59ea0118e51b02fe7..f54dc2d37a6a43303542062212f6b0aff45e0c67 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -74,27 +74,6 @@ function main()
        }
        define('TEST_PHP_SRCDIR', getcwd());
 
-
-       /* Sanity check to ensure that pcre extension needed by this script is available.
-        * In the event it is not, print a nice error message indicating that this script will
-        * not run without it.
-        */
-
-       if (!extension_loaded('pcre')) {
-               echo <<<NO_PCRE_ERROR
-
-+-----------------------------------------------------------+
-|                       ! ERROR !                           |
-| The test-suite requires that you have pcre extension      |
-| enabled. To enable this extension either compile your PHP |
-| with --with-pcre-regex or if you've compiled pcre as a    |
-| shared module load it via php.ini.                        |
-+-----------------------------------------------------------+
-
-NO_PCRE_ERROR;
-               exit(1);
-       }
-
        if (!function_exists('proc_open')) {
                echo <<<NO_PROC_OPEN_ERROR
 
@@ -2680,7 +2659,7 @@ COMMAND $cmd
                                        $info = " (warn: XFAIL section but test passes)";
                                } if (isset($section_text['XLEAK'])) {
                                        $warn = true;
-                                       $info = " (warn: XLEAK section but test passes)";      
+                                       $info = " (warn: XLEAK section but test passes)";
                 } else {
                                        show_result("PASS", $tested, $tested_file, '', $temp_filenames);
                                        junit_mark_test_as('PASS', $shortname, $tested);
@@ -2704,7 +2683,7 @@ COMMAND $cmd
        }
 
        if ($leaked) {
-        $restype[] = isset($section_text['XLEAK']) ? 
+        $restype[] = isset($section_text['XLEAK']) ?
                         'XLEAK' : 'LEAK';
        }