variables_order needs to include S for both of these to work

diff --git a/ext/standard/tests/general_functions/getopt.phpt b/ext/standard/tests/general_functions/getopt.phpt
index 13a4fa558f39f1296b068bb48652cb9a50e41155..b896212becd31be02d7dab14f02616da1412aa4e 100644 (file)
--- a/ext/standard/tests/general_functions/getopt.phpt
+++ b/ext/standard/tests/general_functions/getopt.phpt
@@ -2,14 +2,14 @@
 getopt
 --ARGS--
 -v -h -d test -m 1234 -t -j
+--INI--
+variables_order="GPCSE"
+register_argc_argv=1
 --SKIPIF--
 <?php
        if (substr(PHP_OS, 0, 3) == 'WIN') {
                die('skip getopt() is currently not available on Windows');
        }
-       if (!ini_get('register_argc_argv')) {
-               die("skip this test needs register_argc_argv to be enabled");
-       }
 ?>
 --FILE--
 <?php

diff --git a/tests/basic/012.phpt b/tests/basic/012.phpt
index 7e70f9a018606bc8a6d5c55813ac7ea61fd94f0b..b1d9c2ff03bc389c904799efbaaca3dc77d3587d 100644 (file)
--- a/tests/basic/012.phpt
+++ b/tests/basic/012.phpt
@@ -4,6 +4,7 @@ Testing $argc and $argv handling (cli)
 <?php if(php_sapi_name()!='cli') echo 'skip'; ?>
 --INI--
 register_argc_argv=1
+variables_order="GPCSE"
 --ARGS--
 ab cd ef 123 test
 --FILE--