pdo_dblib - improve test skip messages

5 files changed, 15 insertions, 42 deletions

diff --git a/ext/pdo_dblib/tests/bug_38955.phpt b/ext/pdo_dblib/tests/bug_38955.phpt
index 95f5f204b4..1954ed460b 100644
--- a/ext/pdo_dblib/tests/bug_38955.phpt
+++ b/ext/pdo_dblib/tests/bug_38955.phpt
@@ -4,18 +4,10 @@
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-try {
-	$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-} catch (PDOException $e) {
-	die('skip ' . $e->getMessage());
-}
 ?>
 --FILE--
 <?php
 require dirname(__FILE__) . '/config.inc';
-$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
 /*We see these rows */
 $db->query("CREATE table php_test(val int)");
diff --git a/ext/pdo_dblib/tests/bug_45876.phpt b/ext/pdo_dblib/tests/bug_45876.phpt
index 6b48e5cafb..920905830a 100644
--- a/ext/pdo_dblib/tests/bug_45876.phpt
+++ b/ext/pdo_dblib/tests/bug_45876.phpt
@@ -4,18 +4,10 @@ PDO_DBLIB: Does not support get column meta
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-try {
-	$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-} catch (PDOException $e) {
-	die('skip ' . $e->getMessage());
-}
 ?>
 --FILE--
 <?php
 require dirname(__FILE__) . '/config.inc';
-$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
 $stmt = $db->prepare("select ic1.* from information_schema.columns ic1");
 $stmt->execute();
diff --git a/ext/pdo_dblib/tests/bug_47588.phpt b/ext/pdo_dblib/tests/bug_47588.phpt
index e1835ffefe..d8f424e872 100644
--- a/ext/pdo_dblib/tests/bug_47588.phpt
+++ b/ext/pdo_dblib/tests/bug_47588.phpt
@@ -4,19 +4,10 @@ PDO_DBLIB: Quoted field names
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-try {
-	$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-} catch (PDOException $e) {
-	die('skip ' . $e->getMessage());
-}
-
 ?>
 --FILE--
 <?php
 require dirname(__FILE__) . '/config.inc';
-$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
 $db->query('CREATE TABLE "Test Table" ("My Field" int, "Another Field" varchar(32) not null default \'test_string\')');
 $db->query('INSERT INTO "Test Table" ("My Field") values(1)');
diff --git a/ext/pdo_dblib/tests/bug_50755.phpt b/ext/pdo_dblib/tests/bug_50755.phpt
index 8073706de6..95d1a8bc70 100644
--- a/ext/pdo_dblib/tests/bug_50755.phpt
+++ b/ext/pdo_dblib/tests/bug_50755.phpt
@@ -4,18 +4,10 @@ PDO_DBLIB: Out of memory on large recordsets
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require dirname(__FILE__) . '/config.inc';
-try {
-	$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-} catch (PDOException $e) {
-	die('skip ' . $e->getMessage());
-}
 ?>
 --FILE--
 <?php
 require dirname(__FILE__) . '/config.inc';
-$db = new PDO( getenv('PDOTEST_DSN'), getenv('PDOTEST_USER'), getenv('PDOTEST_PASS'));
-$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
 /* This should be sufficient to overflow any buffers */
 $stmt = $db->prepare("select *
diff --git a/ext/pdo_dblib/tests/config.inc b/ext/pdo_dblib/tests/config.inc
index 862d504ec7..5b7b4d4327 100644
--- a/ext/pdo_dblib/tests/config.inc
+++ b/ext/pdo_dblib/tests/config.inc
@@ -1,20 +1,26 @@
 <?php
 
 if (false !== getenv('PDO_DBLIB_TEST_DSN')) 
-	$config['ENV']['PDOTEST_DSN'] = getenv('PDO_DBLIB_TEST_DSN');
+	$dsn = getenv('PDO_DBLIB_TEST_DSN');
 else
-	$config['ENV']['PDOTEST_DSN'] = 'dblib:host=localhost dbname=test';
+	$dsn = 'dblib:host=localhost;dbname=test';
 
 if (false !== getenv('PDO_DBLIB_TEST_USER')) 	
-	$config['ENV']['PDOTEST_USER'] = getenv('PDO_DBLIB_TEST_USER');
+	$user = getenv('PDO_DBLIB_TEST_USER');
+else
+	$user = 'php';
+	
 	
 if (false !== getenv('PDO_DBLIB_TEST_PASS')) 	
-	$config['ENV']['PDOTEST_PASS'] = getenv('PDO_DBLIB_TEST_PASS');
+	$pass = getenv('PDO_DBLIB_TEST_PASS');
+else
+	$pass = 'password';
 
-if (false !== getenv('PDO_DBLIB_TEST_ATTR'))
-	$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_DBLIB_TEST_ATTR');
-	
-foreach ($config['ENV'] as $k => $v) {
-	putenv("$k=$v");
+try {
+	$db = new PDO($dsn, $user, $pass);
+	$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
+} catch (PDOException $e) {
+	die('skip ' . $e->getMessage());
 }
 ?>