jani                                     Thu, 10 Sep 2009 15:05:34 +0000

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

Log:
- Fix skips

Changed paths:
    U   php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c
    U   php/php-src/branches/PHP_5_3/Zend/zend_language_scanner_defs.h
    _U  php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_2.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_3.phpt

Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c   2009-09-10 
14:43:11 UTC (rev 288243)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c   2009-09-10 
15:05:34 UTC (rev 288244)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
+/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+

Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner_defs.h
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_language_scanner_defs.h      
2009-09-10 14:43:11 UTC (rev 288243)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner_defs.h      
2009-09-10 15:05:34 UTC (rev 288244)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
+/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */
 #line 3 "Zend/zend_language_scanner_defs.h"

 enum YYCONDTYPE {


Property changes on: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links
___________________________________________________________________
Added: svn:ignore
   + phpt.*
*.mem
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno


Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
    2009-09-10 14:43:11 UTC (rev 288243)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746.phpt
    2009-09-10 15:05:34 UTC (rev 288244)
@@ -6,14 +6,14 @@

 --SKIPIF--
 <?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+    die('skip windows only test');
+}
 $cmd = "mklink.exe /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
     die("mklink.exe not found in PATH");
 }
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
 ?>
 --FILE--
 <?php
@@ -51,4 +51,4 @@
 bool(true)
 bool(true)
 bool(true)
-bool(true)
\ No newline at end of file
+bool(true)

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
  2009-09-10 14:43:11 UTC (rev 288243)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_1.phpt
  2009-09-10 15:05:34 UTC (rev 288244)
@@ -6,14 +6,14 @@

 --SKIPIF--
 <?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+    die('skip windows only test');
+}
 $cmd = "mklink.exe /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
     die("mklink.exe not found in PATH");
 }
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
 ?>
 --FILE--
 <?php
@@ -53,4 +53,4 @@
 I am included.
 bool(true)
 bool(true)
-bool(true)
\ No newline at end of file
+bool(true)

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_2.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_2.phpt
  2009-09-10 14:43:11 UTC (rev 288243)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_2.phpt
  2009-09-10 15:05:34 UTC (rev 288244)
@@ -6,14 +6,14 @@

 --SKIPIF--
 <?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+    die('skip windows only test');
+}
 $cmd = "mklink.exe /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
     die("mklink.exe not found in PATH");
 }
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
 ?>
 --FILE--
 <?php
@@ -63,4 +63,4 @@
     [1] => ..
     [2] => a.php
     [3] => b.php
-)
\ No newline at end of file
+)

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_3.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_3.phpt
  2009-09-10 14:43:11 UTC (rev 288243)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_links/bug48746_3.phpt
  2009-09-10 15:05:34 UTC (rev 288244)
@@ -6,14 +6,14 @@

 --SKIPIF--
 <?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+    die('skip windows only test');
+}
 $cmd = "junction.exe /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
     die("junction.exe not found in PATH");
 }
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-    die('skip windows only test');
-}
 ?>
 --FILE--
 <?php
@@ -45,4 +45,4 @@
     [1] => ..
     [2] => a.php
     [3] => b.php
-)
\ No newline at end of file
+)

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

Reply via email to