Always show handler used

7 files changed, 29 insertions, 13 deletions

diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index 909f78214d..68d3373376 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -7,12 +7,14 @@ DBA File Creation Test
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
-    	echo "database file created with $handler.\n";
+    	echo "database file created\n";
+		dba_close($db_file);
 	} else {
     	echo "$db_file does not exist\n";
     }
-	dba_close($db_file);
 ?>
 --EXPECTF--
-database file created with %s.
\ No newline at end of file
+database handler: %s
+database file created
\ No newline at end of file
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index d2fd7d012c..d4e4eb1710 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -7,6 +7,7 @@ DBA Insert/Fetch Test
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("key1", "This is a test insert", $db_file);
 		echo dba_fetch("key1", $db_file);
@@ -15,5 +16,6 @@ DBA Insert/Fetch Test
 		echo "Error creating database\n";
 	}
 ?>
---EXPECT--
+--EXPECTF--
+database handler: %s
 This is a test insert
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index 64225a8329..5fdc622c1b 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -7,6 +7,7 @@ DBA Insert/Replace/Fetch Test
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("key1", "This is a test insert", $db_file);
 		dba_replace("key1", "This is the replacement text", $db_file);
@@ -17,5 +18,6 @@ DBA Insert/Replace/Fetch Test
 		echo "Error creating database\n";
 	}
 ?>
---EXPECT--
+--EXPECTF--
+database handler: %s
 This is the replacement text
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index 9259a78d57..5403ae0033 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -7,6 +7,7 @@ DBA Multiple Insert/Fetch Test
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("key1", "Content String 1", $db_file);
 		dba_insert("key2", "Content String 2", $db_file);
@@ -21,5 +22,6 @@ DBA Multiple Insert/Fetch Test
 		echo "Error creating database\n";
 	}
 ?>
---EXPECT--
+--EXPECTF--
+database handler: %s
 Another Content String Content String 2
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index 98b1d9e7e9..d2b958ca61 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -7,6 +7,7 @@ DBA FirstKey/NextKey Loop Test With 5 Items
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("key1", "Content String 1", $db_file);
 		dba_insert("key2", "Content String 2", $db_file);
@@ -28,5 +29,6 @@ DBA FirstKey/NextKey Loop Test With 5 Items
 		echo "Error creating database\n";
 	}
 ?>
---EXPECT--
+--EXPECTF--
+database handler: %s
 5YYYYY
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index 5d9882a1b0..a572a70f3b 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -7,6 +7,7 @@ DBA FirstKey/NextKey with 2 deletes
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("key1", "Content String 1", $db_file);
 		dba_insert("key2", "Content String 2", $db_file);
@@ -30,5 +31,6 @@ DBA FirstKey/NextKey with 2 deletes
 		echo "Error creating database\n";
 	}
 ?>
---EXPECT--
+--EXPECTF--
+database handler: %s
 3NYNYY
\ No newline at end of file
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index 82316cfd01..65509bc240 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -8,20 +8,21 @@ DBA Multiple File Creation Test
 --FILE--
 <?php
 	require_once('test.inc');
+	echo "database handler: $handler\n";
 	$db_file1 = dirname(__FILE__).'/test1.dbm'; 
 	$db_file2 = dirname(__FILE__).'/test2.dbm'; 
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
-    	echo "database file created with $handler.\n";
+    	echo "database file created\n";
 	} else {
     	echo "$db_file does not exist\n";
     }
 	if (($db_file1=dba_open($db_file1, "n", $handler))!==FALSE) {
-    	echo "database file created with $handler.\n";
+    	echo "database file created\n";
 	} else {
     	echo "$db_file does not exist\n";
     }
 	if (($db_file2=dba_open($db_file2, "n", $handler))!==FALSE) {
-    	echo "database file created with $handler.\n";
+    	echo "database file created\n";
 	} else {
     	echo "$db_file does not exist\n";
     }
@@ -29,10 +30,13 @@ DBA Multiple File Creation Test
 	dba_close($db_file);
 ?>
 --EXPECTF--
-database file created with %s.
+database handler: %s
+database file created
+database file created
+database file created
 array(3) {
   [%d]=>
-  string(%d) "%sext/dba/tests/test.dbm"
+  string(%d) "%sext/dba/tests/test0.dbm"
   [%d]=>
   string(%d) "%sext/dba/tests/test1.dbm"
   [%d]=>