wez Thu Jul 7 11:15:02 2005 EDT
Modified files:
/php-src/ext/pdo/tests pdo_001.phpt pdo_002.phpt pdo_003.phpt
pdo_004.phpt pdo_005.phpt pdo_006.phpt
pdo_007.phpt pdo_008.phpt pdo_009.phpt
pdo_010.phpt pdo_011.phpt pdo_012.phpt
pdo_013.phpt pdo_014.phpt pdo_015.phpt
pdo_016.phpt pdo_017.phpt pdo_018.phpt
pdo_019.phpt pdo_020.phpt pdo_021.phpt
pdo_022.phpt pdo_023.phpt pdo_024.phpt
pdo_025.phpt pdo_026.phpt pdo_test.inc
Log:
skip if we can't connect (include reason in skip output)
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_001.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_001.phpt
diff -u php-src/ext/pdo/tests/pdo_001.phpt:1.2
php-src/ext/pdo/tests/pdo_001.phpt:1.3
--- php-src/ext/pdo/tests/pdo_001.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_001.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_002.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_002.phpt
diff -u php-src/ext/pdo/tests/pdo_002.phpt:1.2
php-src/ext/pdo/tests/pdo_002.phpt:1.3
--- php-src/ext/pdo/tests/pdo_002.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_002.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_003.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_003.phpt
diff -u php-src/ext/pdo/tests/pdo_003.phpt:1.2
php-src/ext/pdo/tests/pdo_003.phpt:1.3
--- php-src/ext/pdo/tests/pdo_003.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_003.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_004.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_004.phpt
diff -u php-src/ext/pdo/tests/pdo_004.phpt:1.2
php-src/ext/pdo/tests/pdo_004.phpt:1.3
--- php-src/ext/pdo/tests/pdo_004.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_004.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_005.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_005.phpt
diff -u php-src/ext/pdo/tests/pdo_005.phpt:1.2
php-src/ext/pdo/tests/pdo_005.phpt:1.3
--- php-src/ext/pdo/tests/pdo_005.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_005.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_006.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_006.phpt
diff -u php-src/ext/pdo/tests/pdo_006.phpt:1.2
php-src/ext/pdo/tests/pdo_006.phpt:1.3
--- php-src/ext/pdo/tests/pdo_006.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_006.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_007.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_007.phpt
diff -u php-src/ext/pdo/tests/pdo_007.phpt:1.2
php-src/ext/pdo/tests/pdo_007.phpt:1.3
--- php-src/ext/pdo/tests/pdo_007.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_007.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_008.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_008.phpt
diff -u php-src/ext/pdo/tests/pdo_008.phpt:1.2
php-src/ext/pdo/tests/pdo_008.phpt:1.3
--- php-src/ext/pdo/tests/pdo_008.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_008.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_009.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo/tests/pdo_009.phpt
diff -u php-src/ext/pdo/tests/pdo_009.phpt:1.3
php-src/ext/pdo/tests/pdo_009.phpt:1.4
--- php-src/ext/pdo/tests/pdo_009.phpt:1.3 Thu Jul 7 10:09:58 2005
+++ php-src/ext/pdo/tests/pdo_009.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_010.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo/tests/pdo_010.phpt
diff -u php-src/ext/pdo/tests/pdo_010.phpt:1.3
php-src/ext/pdo/tests/pdo_010.phpt:1.4
--- php-src/ext/pdo/tests/pdo_010.phpt:1.3 Thu Jul 7 10:09:58 2005
+++ php-src/ext/pdo/tests/pdo_010.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_011.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_011.phpt
diff -u php-src/ext/pdo/tests/pdo_011.phpt:1.2
php-src/ext/pdo/tests/pdo_011.phpt:1.3
--- php-src/ext/pdo/tests/pdo_011.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_011.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_012.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_012.phpt
diff -u php-src/ext/pdo/tests/pdo_012.phpt:1.2
php-src/ext/pdo/tests/pdo_012.phpt:1.3
--- php-src/ext/pdo/tests/pdo_012.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_012.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_013.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_013.phpt
diff -u php-src/ext/pdo/tests/pdo_013.phpt:1.2
php-src/ext/pdo/tests/pdo_013.phpt:1.3
--- php-src/ext/pdo/tests/pdo_013.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_013.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_014.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_014.phpt
diff -u php-src/ext/pdo/tests/pdo_014.phpt:1.2
php-src/ext/pdo/tests/pdo_014.phpt:1.3
--- php-src/ext/pdo/tests/pdo_014.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_014.phpt Thu Jul 7 11:15:01 2005
@@ -3,9 +3,12 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
if (!extension_loaded('SPL')) print 'skip SPL not available';
if (!class_exists('IteratorIterator')) print 'skip IteratorIterator class not
present';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_015.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_015.phpt
diff -u php-src/ext/pdo/tests/pdo_015.phpt:1.2
php-src/ext/pdo/tests/pdo_015.phpt:1.3
--- php-src/ext/pdo/tests/pdo_015.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_015.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_016.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_016.phpt
diff -u php-src/ext/pdo/tests/pdo_016.phpt:1.4
php-src/ext/pdo/tests/pdo_016.phpt:1.5
--- php-src/ext/pdo/tests/pdo_016.phpt:1.4 Thu Jul 7 08:44:44 2005
+++ php-src/ext/pdo/tests/pdo_016.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver'; ?>
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
--FILE--
<?php
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_017.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_017.phpt
diff -u php-src/ext/pdo/tests/pdo_017.phpt:1.2
php-src/ext/pdo/tests/pdo_017.phpt:1.3
--- php-src/ext/pdo/tests/pdo_017.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_017.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
/* TODO:
$db = PDOTest::factory();
try {
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_018.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo/tests/pdo_018.phpt
diff -u php-src/ext/pdo/tests/pdo_018.phpt:1.3
php-src/ext/pdo/tests/pdo_018.phpt:1.4
--- php-src/ext/pdo/tests/pdo_018.phpt:1.3 Thu Jul 7 10:09:58 2005
+++ php-src/ext/pdo/tests/pdo_018.phpt Thu Jul 7 11:15:01 2005
@@ -3,8 +3,11 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
if (!interface_exists('Serializable')) print 'skip no Serializable interface';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_019.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_019.phpt
diff -u php-src/ext/pdo/tests/pdo_019.phpt:1.2
php-src/ext/pdo/tests/pdo_019.phpt:1.3
--- php-src/ext/pdo/tests/pdo_019.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_019.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_020.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_020.phpt
diff -u php-src/ext/pdo/tests/pdo_020.phpt:1.2
php-src/ext/pdo/tests/pdo_020.phpt:1.3
--- php-src/ext/pdo/tests/pdo_020.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_020.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_021.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_021.phpt
diff -u php-src/ext/pdo/tests/pdo_021.phpt:1.4
php-src/ext/pdo/tests/pdo_021.phpt:1.5
--- php-src/ext/pdo/tests/pdo_021.phpt:1.4 Thu Jul 7 08:42:52 2005
+++ php-src/ext/pdo/tests/pdo_021.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_022.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_022.phpt
diff -u php-src/ext/pdo/tests/pdo_022.phpt:1.2
php-src/ext/pdo/tests/pdo_022.phpt:1.3
--- php-src/ext/pdo/tests/pdo_022.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_022.phpt Thu Jul 7 11:15:01 2005
@@ -4,7 +4,10 @@
<?php # vim:ft=php
die('skip this feature is not yet finalized, no test makes sense');
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
/*
* Note well: meta information is a nightmare to handle portably.
* it's not really PDOs job.
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_023.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_023.phpt
diff -u php-src/ext/pdo/tests/pdo_023.phpt:1.2
php-src/ext/pdo/tests/pdo_023.phpt:1.3
--- php-src/ext/pdo/tests/pdo_023.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_023.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_024.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_024.phpt
diff -u php-src/ext/pdo/tests/pdo_024.phpt:1.2
php-src/ext/pdo/tests/pdo_024.phpt:1.3
--- php-src/ext/pdo/tests/pdo_024.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_024.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_025.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_025.phpt
diff -u php-src/ext/pdo/tests/pdo_025.phpt:1.2
php-src/ext/pdo/tests/pdo_025.phpt:1.3
--- php-src/ext/pdo/tests/pdo_025.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_025.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_026.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo/tests/pdo_026.phpt
diff -u php-src/ext/pdo/tests/pdo_026.phpt:1.2
php-src/ext/pdo/tests/pdo_026.phpt:1.3
--- php-src/ext/pdo/tests/pdo_026.phpt:1.2 Wed Jul 6 09:19:25 2005
+++ php-src/ext/pdo/tests/pdo_026.phpt Thu Jul 7 11:15:01 2005
@@ -3,7 +3,10 @@
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded('pdo')) print 'skip';
-if (false == getenv('REDIR_TEST_DIR')) print 'skip no driver';
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) print 'skip no driver';
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
?>
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_test.inc?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo/tests/pdo_test.inc
diff -u php-src/ext/pdo/tests/pdo_test.inc:1.3
php-src/ext/pdo/tests/pdo_test.inc:1.4
--- php-src/ext/pdo/tests/pdo_test.inc:1.3 Thu Jul 7 09:59:34 2005
+++ php-src/ext/pdo/tests/pdo_test.inc Thu Jul 7 11:15:01 2005
@@ -31,6 +31,14 @@
$db->setAttribute(PDO_ATTR_CASE, PDO_CASE_LOWER);
return $db;
}
+
+ static function skip() {
+ try {
+ $db = PDOTest::factory();
+ } catch (PDOException $e) {
+ echo "skip " . $e->getMessage();
+ }
+ }
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php