From: Anatoliy Belsky <ab@php.net>
Date: Thu, 26 Apr 2012 13:17:46 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94d96f77826e46f114d4bc1777e1edcdfef002a2;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
---

94d96f77826e46f114d4bc1777e1edcdfef002a2
diff --cc ext/sqlite3/tests/sqlite3_15_open_error.phpt
index ea1ee42992,9b0496f889..fc05b87802
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@@ -2,7 -2,10 +2,10 @@@
  SQLite3::open error test
  --SKIPIF--
  <?php
+ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
+ 	die('skip non windows test');
+ }
 -require_once(dirname(__FILE__) . '/skipif.inc');
 +require_once(__DIR__ . '/skipif.inc');
  if (posix_geteuid() == 0) {
      die('SKIP Cannot run test as root.');
  }