- Fix skips

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 84b63f3c450e1e7c21f423595e8e27192a8bab56..b340b1d5919a97b3bd9b57dcb5e6876bc3a0fec5 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -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"
 /*
    +----------------------------------------------------------------------+

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 48bd8d539c68be70c25b411b5799bd9aa306a48e..b2bce820fdb485523d536e25a081197318e4b44e 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -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 {

diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt
index 4f8f110a2222495151dc8904df28e79c9386cbd9..fd365113dc61448bfbc14f1101f4b5294f2caf55 100644 (file)
--- a/ext/standard/tests/file/windows_links/bug48746.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746.phpt
@@ -6,14 +6,14 @@ Venkat Raman Don (don.raman@microsoft.com)
 \r
 --SKIPIF--\r
 <?php\r
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
+    die('skip windows only test');\r
+}\r
 $cmd = "mklink.exe /?";\r
 $ret = @exec($cmd, $output, $return_val);\r
 if (count($output) == 0) {\r
     die("mklink.exe not found in PATH");\r
 }\r
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
-    die('skip windows only test');\r
-}\r
 ?>\r
 --FILE--\r
 <?php\r
@@ -51,4 +51,4 @@ bool(true)
 bool(true)\r
 bool(true)\r
 bool(true)\r
-bool(true)
\ No newline at end of file
+bool(true)

diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt
index 32cb192c983aec31e036e4ba8f89f9ade2094f7e..ca8450a897b659fe903c99e8a7400767aa546eb9 100644 (file)
--- a/ext/standard/tests/file/windows_links/bug48746_1.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt
@@ -6,14 +6,14 @@ Venkat Raman Don (don.raman@microsoft.com)
 \r
 --SKIPIF--\r
 <?php\r
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
+    die('skip windows only test');\r
+}\r
 $cmd = "mklink.exe /?";\r
 $ret = @exec($cmd, $output, $return_val);\r
 if (count($output) == 0) {\r
     die("mklink.exe not found in PATH");\r
 }\r
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
-    die('skip windows only test');\r
-}\r
 ?>\r
 --FILE--\r
 <?php\r
@@ -53,4 +53,4 @@ I am included.
 I am included.\r
 bool(true)\r
 bool(true)\r
-bool(true)
\ No newline at end of file
+bool(true)

diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt
index 6c5c4fc0930c44cd1128df21b61fe4328d84c8b3..a8cf48d3a88fd3f213eb1e71b278381433571d65 100644 (file)
--- a/ext/standard/tests/file/windows_links/bug48746_2.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt
@@ -6,14 +6,14 @@ Venkat Raman Don (don.raman@microsoft.com)
 \r
 --SKIPIF--\r
 <?php\r
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
+    die('skip windows only test');\r
+}\r
 $cmd = "mklink.exe /?";\r
 $ret = @exec($cmd, $output, $return_val);\r
 if (count($output) == 0) {\r
     die("mklink.exe not found in PATH");\r
 }\r
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
-    die('skip windows only test');\r
-}\r
 ?>\r
 --FILE--\r
 <?php\r
@@ -63,4 +63,4 @@ Array
     [1] => ..\r
     [2] => a.php\r
     [3] => b.php\r
-)
\ No newline at end of file
+)

diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt
index ee8caa6ecf1b63bede80e7ccb6ce937fa94e43e2..ebc31ea59815a659f7b8b1274d64bc6599dd1735 100644 (file)
--- a/ext/standard/tests/file/windows_links/bug48746_3.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt
@@ -6,14 +6,14 @@ Venkat Raman Don (don.raman@microsoft.com)
 \r
 --SKIPIF--\r
 <?php\r
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
+    die('skip windows only test');\r
+}\r
 $cmd = "junction.exe /?";\r
 $ret = @exec($cmd, $output, $return_val);\r
 if (count($output) == 0) {\r
     die("junction.exe not found in PATH");\r
 }\r
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {\r
-    die('skip windows only test');\r
-}\r
 ?>\r
 --FILE--\r
 <?php\r
@@ -45,4 +45,4 @@ Array
     [1] => ..\r
     [2] => a.php\r
     [3] => b.php\r
-)
\ No newline at end of file
+)