make tests work with CLI

8 files changed, 15 insertions, 4 deletions

diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index 55900fdda6..c707906e2f 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -3,6 +3,8 @@ Session Object Serialization
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 --FILE--
 <?php
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 9471a3504b..cded6b8367 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -3,6 +3,8 @@ Session Object Deserialization
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 --FILE--
 <?php
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index fd53b8bb84..7e8b0071d9 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -3,6 +3,8 @@ session_set_save_handler test
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 --FILE--
 <?php
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index d4dc8b3992..a35338ee4e 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -3,6 +3,8 @@ Custom save handler, multiple session_start()s, complex data structure test.
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 --FILE--
 <?php
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 09aedb4732..51381ab1fa 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -3,6 +3,8 @@ References between variables in sessions
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 --FILE--
 <?php
diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt
index cca4d013fa..e915d39046 100644
--- a/ext/session/tests/007.phpt
+++ b/ext/session/tests/007.phpt
@@ -3,6 +3,8 @@ Verify PHP 4.2 compatibility: unset($c) with enabled register_globals
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=1
 session.bug_compat_42=1
 --FILE--
diff --git a/ext/session/tests/008.phpt b/ext/session/tests/008.phpt
index e940abc149..a1c9a4a7a0 100644
--- a/ext/session/tests/008.phpt
+++ b/ext/session/tests/008.phpt
@@ -3,6 +3,8 @@ Verify PHP 4.2 compatibility: global is used albeit register_globals=0
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
+session.use_cookies=0
+session.cache_limiter=
 register_globals=0
 session.bug_compat_42=1
 session.bug_compat_warn=0
diff --git a/ext/session/tests/skipif.inc b/ext/session/tests/skipif.inc
index 29e2bb4cd4..8336e75bd0 100644
--- a/ext/session/tests/skipif.inc
+++ b/ext/session/tests/skipif.inc
@@ -1,8 +1,5 @@
 <?php
 // This script prints "skip" if condition does not meet.
-if (PHP_SAPI != 'cgi') {
-    die("skip\n");
-}
 if (!extension_loaded("session") && ini_get("enable_dl")) {
   $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
   @dl("session$dlext");
@@ -10,4 +7,4 @@ if (!extension_loaded("session") && ini_get("enable_dl")) {
 if (!extension_loaded("session")) {
     die("skip\n");
 }
-?>
\ No newline at end of file
+?>