cvs: php-src /ext/pdo_mysql/tests bug_33689.phpt common.phpt config.inc show_tables.phpt

sniper Thu Aug 11 19:45:14 2005 EDT Added files: /php-src/ext/pdo_mysql/tests config.inc Modified files: /php-src/ext/pdo_mysql/tests bug_33689.phpt common.phpt show_tables.phpt Log: fix skip conditions http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/bug_33689.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo_mysql/tests/bug_33689.phpt diff -u php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1 php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.2 --- php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1 Wed Jul 13 22:21:03 2005 +++ php-src/ext/pdo_mysql/tests/bug_33689.phpt Thu Aug 11 19:45:13 2005 @@ -1,8 +1,11 @@ --TEST-- PDO MySQL Bug #33689 --SKIPIF-- -<?php # vim:ft=php -if (!extension_loaded('pdo_mysql')) print 'skip not loaded'; +<?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'; +PDOTest::skip(); ?> --FILE-- <?php http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/common.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo_mysql/tests/common.phpt diff -u php-src/ext/pdo_mysql/tests/common.phpt:1.1 php-src/ext/pdo_mysql/tests/common.phpt:1.2 --- php-src/ext/pdo_mysql/tests/common.phpt:1.1 Thu Jul 7 11:04:45 2005 +++ php-src/ext/pdo_mysql/tests/common.phpt Thu Aug 11 19:45:13 2005 @@ -2,7 +2,8 @@ MySQL --SKIPIF-- <?php # vim:ft=php -if (!extension_loaded('pdo_mysql')) print 'skip'; ?> +if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) print 'skip not loaded'; +?> --REDIRECTTEST-- # magic auto-configuration http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/show_tables.phpt?r1=1.1&r2=1.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 php-src/ext/pdo_mysql/tests/show_tables.phpt:1.2 --- php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1 Wed Jul 13 22:09:54 2005 +++ php-src/ext/pdo_mysql/tests/show_tables.phpt Thu Aug 11 19:45:13 2005 @@ -1,8 +1,11 @@ --TEST-- PDO MySQL SHOW TABLES --SKIPIF-- -<?php # vim:ft=php -if (!extension_loaded('pdo_mysql')) print 'skip not loaded'; +<?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'; +PDOTest::skip(); ?> --FILE-- <?php http://cvs.php.net/co.php/php-src/ext/pdo_mysql/tests/config.inc?r=1.1&p=1 Index: php-src/ext/pdo_mysql/tests/config.inc +++ php-src/ext/pdo_mysql/tests/config.inc <?php if (false !== getenv('PDO_MYSQL_TEST_DSN')) { # user set them from their shell $config['ENV']['PDOTEST_DSN'] = getenv('PDO_MYSQL_TEST_DSN'); $config['ENV']['PDOTEST_USER'] = getenv('PDO_MYSQL_TEST_USER'); $config['ENV']['PDOTEST_PASS'] = getenv('PDO_MYSQL_TEST_PASS'); if (false !== getenv('PDO_MYSQL_TEST_ATTR')) { $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_MYSQL_TEST_ATTR'); } } else { $config['ENV']['PDOTEST_DSN'] = 'mysql:host=localhost;dbname=test'; $config['ENV']['PDOTEST_USER'] = 'root'; $config['ENV']['PDOTEST_PASS'] = ''; } foreach ($config['ENV'] as $k => $v) { putenv("$k=$v"); }