pajoye                                   Thu, 01 Sep 2011 12:42:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315979

Log:
- win and nux work the same way

Changed paths:
    U   php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
    D   php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
    U   php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
    U   php/php-src/trunk/tests/security/open_basedir_glob.phpt

Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt  
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt  
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
 --TEST--
 Test open_basedir configuration
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip Not for Windows variation');
-}
-?>
 --INI--
 open_basedir=.
 --FILE--

Deleted: 
php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt    
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt    
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,59 +0,0 @@
---TEST--
-Test open_basedir configuration
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip Windows only variation');
-}
-?>
---INI--
-open_basedir=.
---FILE--
-<?php
-require_once "open_basedir.inc";
-test_open_basedir("glob");
-?>
---CLEAN--
-<?php
-require_once "open_basedir.inc";
-delete_directories();
-?>
---EXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
-  [0]=>
-  string(5) "../ok"
-}
-array(1) {
-  [0]=>
-  string(6) "ok.txt"
-}
-array(1) {
-  [0]=>
-  string(12) "../ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/../ok/ok.txt"
-}
-*** Finished testing open_basedir configuration [glob] ***
-

Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt  
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt  
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
 --TEST--
 Test open_basedir configuration
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip Not for Windows variation');
-}
-?>
 --INI--
 open_basedir=.
 --FILE--

Modified: php/php-src/trunk/tests/security/open_basedir_glob.phpt
===================================================================
--- php/php-src/trunk/tests/security/open_basedir_glob.phpt     2011-09-01 
12:35:41 UTC (rev 315978)
+++ php/php-src/trunk/tests/security/open_basedir_glob.phpt     2011-09-01 
12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
 --TEST--
 Test open_basedir configuration
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip Not for Windows variation');
-}
-?>
 --INI--
 open_basedir=.
 --FILE--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to