com php-src: Fix skipifs: tests/run-test/bug75042-2.phpt tests/run-test/bug75042.phpt
| From: | Anatol Belski | Date: | Fri, 18 Aug 2017 15:38:16 +0000 |
| Subject: | com php-src: Fix skipifs: tests/run-test/bug75042-2.phpt tests/run-test/bug75042.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99092@lists.php.net to get a copy of this message | ||
Commit: f1c664d37960be8a53efae67f99193a1c3be22b0
Author: Anatol Belski <ab@php.net> Fri, 18 Aug 2017 17:38:16 +0200
Parents: 59558ffd961c5002be5cf99245c6c76be569cf1e
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1c664d37960be8a53efae67f99193a1c3be22b0
Log:
Fix skipifs
Changed paths:
M tests/run-test/bug75042-2.phpt
M tests/run-test/bug75042.phpt
Diff:
diff --git a/tests/run-test/bug75042-2.phpt b/tests/run-test/bug75042-2.phpt
index c79eb44..25f6d08 100644
--- a/tests/run-test/bug75042-2.phpt
+++ b/tests/run-test/bug75042-2.phpt
@@ -2,10 +2,7 @@
phpt EXTENSIONS directive with static module
--SKIPIF--
<?php
-if(empty($_ENV['TEST_PHP_EXECUTABLE'])) {
- die('skip TEST_PHP_EXECUTABLE not set');
-}
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
if (false === stripos(
$php -n -m, 'spl')) {
die('skip spl is NOT built static');
}
@@ -15,4 +12,4 @@ SPL
<?php
var_dump(extension_loaded('spl'));
--EXPECT--
-bool(true)
\ No newline at end of file
+bool(true)
diff --git a/tests/run-test/bug75042.phpt b/tests/run-test/bug75042.phpt
index 10a0f45..001e8f3 100644
--- a/tests/run-test/bug75042.phpt
+++ b/tests/run-test/bug75042.phpt
@@ -2,10 +2,7 @@
phpt EXTENSIONS directive with shared module
--SKIPIF--
<?php
-if(empty($_ENV['TEST_PHP_EXECUTABLE'])) {
- die('skip TEST_PHP_EXECUTABLE not set');
-}
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
if (false !== stripos($php -n -m, 'openssl')) {
die('skip openssl is built static');
}
@@ -17,4 +14,4 @@ openssl
<?php
var_dump(extension_loaded('openssl'));
--EXPECT--
-bool(true)
\ No newline at end of file
+bool(true)