From 624e5f83c89d19f520c5c466a3561468f70b5541 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 31 Jul 2006 20:14:40 +0000
Subject: [PATCH] Fixed tests from being always skipped.

---
 ext/pdo_mysql/tests/bug_33689.phpt      | 2 ++
 ext/pdo_mysql/tests/common.phpt         | 2 +-
 ext/pdo_mysql/tests/last_insert_id.phpt | 3 ++-
 ext/pdo_mysql/tests/pecl_bug_5200.phpt  | 1 +
 ext/pdo_mysql/tests/pecl_bug_5780.phpt  | 1 +
 ext/pdo_mysql/tests/pecl_bug_5802.phpt  | 1 +
 ext/pdo_mysql/tests/show_tables.phpt    | 3 ++-
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt
index 609e3dce54..bd0a40904a 100644
--- a/ext/pdo_mysql/tests/bug_33689.phpt
+++ b/ext/pdo_mysql/tests/bug_33689.phpt
@@ -5,10 +5,12 @@ PDO MySQL Bug #33689
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
 require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
 <?php
+require dirname(__FILE__) . '/config.inc';
 require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 
diff --git a/ext/pdo_mysql/tests/common.phpt b/ext/pdo_mysql/tests/common.phpt
index 8179454cf7..1d11e0f7e7 100644
--- a/ext/pdo_mysql/tests/common.phpt
+++ b/ext/pdo_mysql/tests/common.phpt
@@ -22,7 +22,7 @@ if (false !== getenv('PDO_MYSQL_TEST_DSN')) {
 } else {
 	$config['ENV']['PDOTEST_DSN'] = 'mysql:host=localhost;dbname=test';
 	$config['ENV']['PDOTEST_USER'] = 'root';
-	$config['ENV']['PDOTEST_PASS'] = '';
+	$config['ENV']['PDOTEST_PASS'] = 'asukasmysql';
 }
 
 return $config;
diff --git a/ext/pdo_mysql/tests/last_insert_id.phpt b/ext/pdo_mysql/tests/last_insert_id.phpt
index d20f1a71af..d48ba14992 100644
--- a/ext/pdo_mysql/tests/last_insert_id.phpt
+++ b/ext/pdo_mysql/tests/last_insert_id.phpt
@@ -4,7 +4,8 @@ PDO MySQL auto_increment / last insert id
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-require  dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/pecl_bug_5200.phpt b/ext/pdo_mysql/tests/pecl_bug_5200.phpt
index 2dffd1141f..639a640c8a 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5200.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5200.phpt
@@ -5,6 +5,7 @@ PDO MySQL PECL Bug #5200
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
 require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/pecl_bug_5780.phpt b/ext/pdo_mysql/tests/pecl_bug_5780.phpt
index 643597c016..ef94db13cc 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5780.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5780.phpt
@@ -5,6 +5,7 @@ PDO MySQL PECL Bug #5780
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
 require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/pecl_bug_5802.phpt b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
index 70bd461635..f154dd13a9 100644
--- a/ext/pdo_mysql/tests/pecl_bug_5802.phpt
+++ b/ext/pdo_mysql/tests/pecl_bug_5802.phpt
@@ -5,6 +5,7 @@ PDO MySQL PECL Bug #5802
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
 require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/show_tables.phpt b/ext/pdo_mysql/tests/show_tables.phpt
index 90b07db32e..97dfe686e7 100644
--- a/ext/pdo_mysql/tests/show_tables.phpt
+++ b/ext/pdo_mysql/tests/show_tables.phpt
@@ -4,7 +4,8 @@ PDO MySQL SHOW TABLES
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-require  dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 PDOTest::skip();
 ?>
 --FILE--
-- 
2.40.0