- Fixed paths

diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt
index 60470660e8fac2cdcf42acf21968c023dfb03703..4e8daa860039845951dcfe5ad261c0721d3d488b 100755 (executable)
--- 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/bug48240.phpt b/ext/dba/tests/bug48240.phpt
index 72dc439564ba3ab39e32bfa1db6b8039c0532036..27f8d95e6ef659d551614735d12a0742e577e895 100644 (file)
--- 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 3d617fb2c231f1bd99a7a13f2f5f8cc354709320..00aec6969762b16d9ea514b53f022eaeb8d72ce4 100644 (file)
--- 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";
@@ -18,4 +18,4 @@ DBA File Creation Test
 ?>
 --EXPECTF--
 database handler: %s
-database file created
\ No newline at end of file
+database file created

diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index 3f862e38c5107155afeaed1b06e7d3560a36438d..974b09fab8ee7238941dec866f4499a34ff453cd 100644 (file)
--- 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 617ae91891ef6bb76205d8547543b66ef474e850..832c7a0dc9c5d11dac7e5614f28450dc59280028 100644 (file)
--- 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 3b1f29c7dd6e230e42dc11b7420ceebbe6ae6c45..42da1c64b9cfcd8b4d1e83793af6a71810acb270 100644 (file)
--- 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 5a933c48f984be24feaf6042ad9219d7fedfb72a..3e7e58086e64ced28f22c952cce9cb02cfdc5625 100644 (file)
--- 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 efa36a5d0709b93047160b2751fce04bd9563a33..f6177b0b9c3fbf8548d89daad4120ed8b68614b8 100644 (file)
--- 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);
@@ -34,4 +34,4 @@ DBA FirstKey/NextKey with 2 deletes
 ?>
 --EXPECTF--
 database handler: %s
-3NYNYY
\ No newline at end of file
+3NYNYY

diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index cc84a729c3245f3859ea4eb4f9d90956b0ef54ac..0f30932fc4c3c7e4897e3840483845cf16439fa3 100644 (file)
--- 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 84a47ba0836f7c7b392420582fddac0f3c912ac1..8fde8ff3f0b744bbbe2de317d4ce7b8a418f68ab 100644 (file)
--- a/ext/dba/tests/dba008.phpt
+++ b/ext/dba/tests/dba008.phpt
@@ -2,12 +2,12 @@
 DBA magic_quotes_runtime 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) {
                ini_set('magic_quotes_runtime', 0);

diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt
index 50a50c6bd5a088fdfca8c894579b1672ad0e5c74..b4d8308e89794ed40d17e6e727798c259de4313c 100755 (executable)
--- 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 f3bf7975ea06c0989386da5c53b9f6e8e5202ba2..0b75596487afef9e59bfb3610e808ced95500927 100644 (file)
--- 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 bb41e82fba79d929ffce4e72523f6ebcd1a23d74..b7311f1dde07483ea1b45dbf74a836e073942996 100644 (file)
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -5,13 +5,13 @@ magic_quotes_runtime=1
 --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 a0fbe7bccaee272c6503759ec725a58d0eeaf11e..71575f5d85e83bd18cbff8aecea1a9ead8b07ae7 100644 (file)
--- 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
@@ -62,4 +62,4 @@ database handler: cdb
 #1122
 ?1212314
 #1212314
-=1231324
\ No newline at end of file
+=1231324

diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt
index 983954b50b1655c8771ae555831cf310f1dde18e..a24600350f55143bee16420c39ce303553211dc8 100755 (executable)
--- 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 bcc5a9479306c89452d1216e5901e14165736a23..89d8a926e125ae759242a22914d30865b43878d9 100644 (file)
--- 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 c6d04cf02d084395664f4bd094efe384484315e3..257c88217524eff50e570bdc858a845ad935ee8e 100644 (file)
--- 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 fcf089a1e90b017113f6ed991302c630027eb571..2c2a7a694555ca52d9faa675f56cf8e2492747fe 100644 (file)
--- 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 fdd7b375f445737c27a9197303fcce4805ad034c..dd1fe1e31cdabebd32446d8f30219e49270b26ad 100644 (file)
--- 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 2e32b8a3278152d5907fc71517a0e0f2568e7ce0..a85472bbeb03c0379a40b8b255b94ee45787a4db 100644 (file)
--- 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 f9b3e3c6067add06475f1ff08ed237bdf496fb89..33d7d206159ac416d87e15938e3b7292e73fad07 100644 (file)
--- 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 9511a8bb49b5f8f1a524e1919db6da72ba271e12..81ab738796315423d153ea378c3a946153236186 100644 (file)
--- 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 f7955c5813ecd5882b3c864fa5f80234f3304428..b0f5542de49696cc72c844aa618f8e777e94d077 100644 (file)
--- 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 a7c9ab69e13aff08f81d80bb8318287d28636de4..ef216d9258bc445edb9026ffdf72c07f7bbbd5fd 100755 (executable)
--- 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 04f954541c553073d7bbf5b66c3bd43e9c0dde46..7c4e207b824761ed137b65c5c52d053780a7ab23 100644 (file)
--- 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');
 ?>