Commit:    94d96f77826e46f114d4bc1777e1edcdfef002a2
Author:    Anatoliy Belsky <a...@php.net>         Thu, 26 Apr 2012 15:17:46 
+0200
Parents:   19df3c1b1c3bcb120ba63d3537e7177b8826fb96 
4daab0abecd5ee583c005d8e7b6affc08af8639d
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=94d96f77826e46f114d4bc1777e1edcdfef002a2

Log:
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

Bugs:
https://bugs.php.net/61791

Changed paths:
  MM  ext/sqlite3/tests/sqlite3_15_open_error.phpt


Diff:
diff --cc ext/sqlite3/tests/sqlite3_15_open_error.phpt
index ea1ee42,9b0496f..fc05b87
--- 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.');
  }


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

Reply via email to