iliaa Mon Oct 17 20:12:37 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql/tests pecl_bug_5200.phpt show_tables.phpt
Log:
Fixed tests for ZTS builds
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt
diff -u php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.2 Mon Sep 19
20:35:21 2005
+++ php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt Mon Oct 17 20:12:30 2005
@@ -3,14 +3,14 @@
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not
loaded');
-require 'ext/pdo_mysql/tests/config.inc';
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_mysql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__). '/common.phpt');
$db->exec("CREATE TABLE test (bar INT NOT NULL, phase enum('please_select',
'I', 'II', 'IIa', 'IIb', 'III', 'IV'))");
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/show_tables.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/pdo_mysql/tests/show_tables.phpt
diff -u php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.1
php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.2
--- php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.1 Thu Aug 11
19:45:22 2005
+++ php-src/ext/pdo_mysql/tests/show_tables.phpt Mon Oct 17 20:12:30 2005
@@ -3,14 +3,14 @@
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not
loaded');
-require 'ext/pdo_mysql/tests/config.inc';
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_mysql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
print_r($db->query('SHOW TABLES'));
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
