Permalink
Browse files

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
  • Loading branch information...
2 parents 72ccce4 + 8249581 commit 455040c4ab07b04547fb6791806d1a9cf6e5a0af @weltling weltling committed Apr 30, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 ext/filter/tests/bug52209.phpt
@@ -1,7 +1,13 @@
--TEST--
Bug #52209 (INPUT_ENV returns NULL for set variables (CLI))
--SKIPIF--
-<?php if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip"); ?>
+<?php
+/* This test makes no sense on windows as an empty variable
+ would never show up in the "set" list. Which means, it's
+ always undefined in PHP. */
+if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
+if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip");
+?>
--INI--
variables_order=GPCSE
--FILE--

0 comments on commit 455040c

Please sign in to comment.