Improve "skip" checks

diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 9987c688b9fc319a4a3a781d5132d0e8dc8ff259..4ca9970bca2afb279e536c2893fc3ac191a96f07 100644 (file)
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -1,8 +1,10 @@
 --TEST--
 OpenSSL private key functions
 --SKIPIF--
-<?php // vim600:syn=php
-include('skipif.inc'); ?>
+<?php 
+if (!extension_loaded("openssl")) die("skip"); 
+if (!@openssl_pkey_new()) die("skip cannot create private key"); 
+?>
 --FILE--
 <?php
 echo "Creating private key\n";

diff --git a/ext/openssl/tests/bug25614.phpt b/ext/openssl/tests/bug25614.phpt
index dc8b23ffd63d8a2534179c7344c3133a8f56e874..a43130708b12065faea0f66adcf11fdf8060188a 100644 (file)
--- a/ext/openssl/tests/bug25614.phpt
+++ b/ext/openssl/tests/bug25614.phpt
@@ -1,7 +1,10 @@
 --TEST--
 openssl: get public key from generated private key
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php 
+if (!extension_loaded("openssl")) die("skip"); 
+if (!@openssl_pkey_new()) die("skip cannot create private key"); 
+?>
 --FILE--
 <?php 
 $priv = openssl_pkey_new();

diff --git a/ext/openssl/tests/skipif.inc b/ext/openssl/tests/skipif.inc
deleted file mode 100644 (file)
index 21e947d..0000000
--- a/ext/openssl/tests/skipif.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-// This script prints "skip" if condition does not meet.
-
-if (!extension_loaded("openssl") && ini_get("enable_dl")) {
-  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-  @dl("openssl$dlext");
-}
-if (!extension_loaded("openssl")) {
-    die("skip\n");
-}
-?>