From 1269ac0661a144feda9a62b46846bd0bca2cb7ca Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 17 Jun 2003 22:32:51 +0000
Subject: [PATCH] variables_order needs to include S for both of these to work

---
 ext/standard/tests/general_functions/getopt.phpt | 6 +++---
 tests/basic/012.phpt                             | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/standard/tests/general_functions/getopt.phpt b/ext/standard/tests/general_functions/getopt.phpt
index 13a4fa558f..b896212bec 100644
--- 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 7e70f9a018..b1d9c2ff03 100644
--- 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--
-- 
2.50.1