From f08443b5f571cd8805350ac02a4cac16632178e1 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sat, 1 Aug 2009 23:26:02 +0000
Subject: [PATCH] - Fixed paths

---
 ext/dba/tests/bug36436.phpt     | 4 ++--
 ext/dba/tests/bug38698.phpt     | 4 ++--
 ext/dba/tests/bug48240.phpt     | 4 ++--
 ext/dba/tests/dba001.phpt       | 4 ++--
 ext/dba/tests/dba002.phpt       | 4 ++--
 ext/dba/tests/dba003.phpt       | 4 ++--
 ext/dba/tests/dba004.phpt       | 4 ++--
 ext/dba/tests/dba005.phpt       | 4 ++--
 ext/dba/tests/dba006.phpt       | 4 ++--
 ext/dba/tests/dba007.phpt       | 4 ++--
 ext/dba/tests/dba008.phpt       | 4 ++--
 ext/dba/tests/dba009.phpt       | 4 ++--
 ext/dba/tests/dba_cdb.phpt      | 6 +++---
 ext/dba/tests/dba_cdb_make.phpt | 4 ++--
 ext/dba/tests/dba_cdb_read.phpt | 2 +-
 ext/dba/tests/dba_db1.phpt      | 6 +++---
 ext/dba/tests/dba_db2.phpt      | 6 +++---
 ext/dba/tests/dba_db3.phpt      | 6 +++---
 ext/dba/tests/dba_db4.phpt      | 6 +++---
 ext/dba/tests/dba_dbm.phpt      | 6 +++---
 ext/dba/tests/dba_flatfile.phpt | 6 +++---
 ext/dba/tests/dba_gdbm.phpt     | 6 +++---
 ext/dba/tests/dba_inifile.phpt  | 6 +++---
 ext/dba/tests/dba_ndbm.phpt     | 6 +++---
 ext/dba/tests/dba_qdbm.phpt     | 6 +++---
 ext/dba/tests/test.inc          | 4 ++--
 26 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt
index 60470660e8f..4e8daa86003 100755
--- a/ext/dba/tests/bug36436.phpt
+++ b/ext/dba/tests/bug36436.phpt
@@ -3,13 +3,13 @@ Bug #36436 (DBA problem with Berkeley DB4)
 --SKIPIF--
 <?php 
 	$handler = 'db4';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 
 $handler = 'db4';
-require_once('test.inc');
+require_once dirname(__FILE__) .'/test.inc';
 
 $db = dba_popen($db_filename, 'c', 'db4');
 
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index 1af979a1134..ca607419bd5 100755
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -3,12 +3,12 @@ Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't
 --SKIPIF--
 <?php 
 	$handler = 'cdb_make';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 
-$db_file = '129php.cdb';
+$db_file = dirname(__FILE__) .'/129php.cdb';
 
 if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) {
 	dba_insert(pack('i',129), "Booo!", $db_make);
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
index 72dc439564b..27f8d95e6ef 100644
--- a/ext/dba/tests/bug48240.phpt
+++ b/ext/dba/tests/bug48240.phpt
@@ -3,13 +3,13 @@ Bug #48240 (DBA Segmentation fault dba_nextkey)
 --SKIPIF--
 <?php 
 	$handler = 'db4';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 
 $handler = 'db4';
-require_once('test.inc');
+require_once dirname(__FILE__) .'/test.inc';
 
 $db = dba_open($db_filename, 'c', 'db4');
 
diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index 33f889ca407..00aec696976 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -2,12 +2,12 @@
 DBA File Creation Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
     	echo "database file created\n";
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index 3f862e38c51..974b09fab8e 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -2,12 +2,12 @@
 DBA Insert/Fetch Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/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);
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index 617ae91891e..832c7a0dc9c 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -2,12 +2,12 @@
 DBA Insert/Replace/Fetch Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/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);
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index 3b1f29c7dd6..42da1c64b9c 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -2,12 +2,12 @@
 DBA Multiple Insert/Fetch Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/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);
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index 5a933c48f98..3e7e58086e6 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -2,12 +2,12 @@
 DBA FirstKey/NextKey Loop Test With 5 Items
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/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);
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index a9f32ed76f4..f6177b0b9c3 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -2,12 +2,12 @@
 DBA FirstKey/NextKey with 2 deletes
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/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);
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index a0a2c57c8e3..d332b5b4aee 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -2,13 +2,13 @@
 DBA Multiple File Creation Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	if (!function_exists('dba_list')) die('skip dba_list() not available');
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	echo "database handler: $handler\n";
 	$db_file1 = dirname(__FILE__).'/test1.dbm'; 
 	$db_file2 = dirname(__FILE__).'/test2.dbm'; 
diff --git a/ext/dba/tests/dba008.phpt b/ext/dba/tests/dba008.phpt
index 0c0e434fd87..3863cc5a629 100644
--- a/ext/dba/tests/dba008.phpt
+++ b/ext/dba/tests/dba008.phpt
@@ -3,12 +3,12 @@ DBA magic_quotes_runtime Test
 --SKIPIF--
 <?php 
 	die('skip, magic_quotes removed');
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	echo "database handler: $handler\n";
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 		ini_set('magic_quotes_runtime', 0);
diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt
index 50a50c6bd5a..b4d8308e897 100755
--- a/ext/dba/tests/dba009.phpt
+++ b/ext/dba/tests/dba009.phpt
@@ -2,12 +2,12 @@
 DBA dba_popen Test
 --SKIPIF--
 <?php 
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	print("info $HND handler used");
 ?>
 --FILE--
 <?php
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	echo "database handler: $handler\n";
 	if (($db=dba_popen($db_file, "n", $handler))!==FALSE) {
 		echo "Opened\n";
diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index fc54822b55c..792fbbfc440 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -3,14 +3,14 @@ DBA CDB handler test
 --SKIPIF--
 <?php 
 	$handler = 'cdb';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die('info CDB does not support replace or delete');
 ?>
 --FILE--
 <?php
 	$handler = 'cdb';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 03e5900c315..3a025951736 100644
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -3,13 +3,13 @@ DBA CDB_MAKE handler test
 --SKIPIF--
 <?php 
 	$handler = 'cdb_make';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	die('info CDB_MAKE does not support reading');
 ?>
 --FILE--
 <?php
 	$handler = 'cdb_make';
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	echo "database handler: $handler\n";
 	// print md5 checksum of test.cdb which is generated by cdb_make program
 	var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index ef6acac600d..71575f5d85e 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -3,7 +3,7 @@ DBA CDB handler test (read only)
 --SKIPIF--
 <?php 
 	$handler = 'cdb_make';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt
index 983954b50b1..a24600350f5 100755
--- a/ext/dba/tests/dba_db1.phpt
+++ b/ext/dba/tests/dba_db1.phpt
@@ -3,13 +3,13 @@ DBA DB1 handler test
 --SKIPIF--
 <?php 
 	$handler = 'db1';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'db1';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt
index bcc5a947930..89d8a926e12 100644
--- a/ext/dba/tests/dba_db2.phpt
+++ b/ext/dba/tests/dba_db2.phpt
@@ -3,13 +3,13 @@ DBA DB2 handler test
 --SKIPIF--
 <?php 
 	$handler = 'db2';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'db2';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt
index c6d04cf02d0..257c8821752 100644
--- a/ext/dba/tests/dba_db3.phpt
+++ b/ext/dba/tests/dba_db3.phpt
@@ -3,13 +3,13 @@ DBA DB3 handler test
 --SKIPIF--
 <?php 
 	$handler = 'db3';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'db3';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_db4.phpt b/ext/dba/tests/dba_db4.phpt
index fcf089a1e90..2c2a7a69455 100644
--- a/ext/dba/tests/dba_db4.phpt
+++ b/ext/dba/tests/dba_db4.phpt
@@ -3,13 +3,13 @@ DBA DB4 handler test
 --SKIPIF--
 <?php 
 	$handler = 'db4';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'db4';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
index fdd7b375f44..dd1fe1e31cd 100644
--- a/ext/dba/tests/dba_dbm.phpt
+++ b/ext/dba/tests/dba_dbm.phpt
@@ -3,13 +3,13 @@ DBA DBM handler test
 --SKIPIF--
 <?php 
 	$handler = 'dbm';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'dbm';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index 7d53157f5c1..30005cd78e1 100644
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -3,13 +3,13 @@ DBA FlatFile handler test
 --SKIPIF--
 <?php 
 	$handler = 'flatfile';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'flatfile';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index f9b3e3c6067..33d7d206159 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -3,14 +3,14 @@ DBA GDBM handler test
 --SKIPIF--
 <?php 
 	$handler = 'gdbm';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'gdbm';
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	$lock_flag = ''; // lock in library
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 	
 	// Read during write is system dependant. Important is that there is no deadlock
 ?>
diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index 8d7c09ff160..12a043b8e2a 100644
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -3,13 +3,13 @@ DBA INIFILE handler test
 --SKIPIF--
 <?php 
 	$handler = 'inifile';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'inifile';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
index f7955c5813e..b0f5542de49 100644
--- a/ext/dba/tests/dba_ndbm.phpt
+++ b/ext/dba/tests/dba_ndbm.phpt
@@ -3,13 +3,13 @@ DBA NDBM handler test
 --SKIPIF--
 <?php 
 	$handler = 'ndbm';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'ndbm';
-	require_once('test.inc');
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/test.inc';
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dba/tests/dba_qdbm.phpt b/ext/dba/tests/dba_qdbm.phpt
index a7c9ab69e13..ef216d9258b 100755
--- a/ext/dba/tests/dba_qdbm.phpt
+++ b/ext/dba/tests/dba_qdbm.phpt
@@ -3,14 +3,14 @@ DBA QDBM handler test
 --SKIPIF--
 <?php
 	$handler = 'qdbm';
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
 --FILE--
 <?php
 	$handler = 'qdbm';
-	require_once('test.inc');
+	require_once dirname(__FILE__) .'/test.inc';
 	$lock_flag = ''; // lock in library
-	require_once('dba_handler.inc');
+	require_once dirname(__FILE__) .'/dba_handler.inc';
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc
index 04f954541c5..7c4e207b824 100644
--- a/ext/dba/tests/test.inc
+++ b/ext/dba/tests/test.inc
@@ -1,7 +1,7 @@
 <?php
-	require_once('skipif.inc');
+	require_once dirname(__FILE__) .'/skipif.inc';
 	$lock_flag = 'l';
-	$db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
+	$db_filename = $db_file = dirname(__FILE__) .'/test0.dbm';
 	@unlink($db_filename);
 	@unlink($db_filename.'.lck');
 ?>