diff options
| author | Marcus Boerger <helly@php.net> | 2002-11-15 16:11:51 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-11-15 16:11:51 +0000 |
| commit | 93769053cc915976fa00a04569a745b8e12efaa6 (patch) | |
| tree | e3f252e1acd21a478f9a8701b94b27f032b66b00 | |
| parent | 003be7fe321caf0104a60ce358ebdffae6d58779 (diff) | |
| download | php-git-93769053cc915976fa00a04569a745b8e12efaa6.tar.gz | |
Use flatfile if available.
# This way we are using the internal library which we know about most.
| -rw-r--r-- | ext/dba/tests/skipif.inc | 10 | ||||
| -rw-r--r-- | ext/dba/tests/test.inc | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ext/dba/tests/skipif.inc b/ext/dba/tests/skipif.inc index 0501587035..141c907111 100644 --- a/ext/dba/tests/skipif.inc +++ b/ext/dba/tests/skipif.inc @@ -2,15 +2,19 @@ if (!extension_loaded('dba')) die('skip dba extension not available'); if (!function_exists('dba_handlers')) die ('skip dba_handlers() not available'); if (!sizeof(dba_handlers())) die('skip no handlers installed'); - // CDB currently supports only reading $handler = dba_handlers(); - if ($handler[0]=='cdb') { + if (in_array('flatfile', $handler)) { + $handler = 'flatfile'; + } elseif ($handler[0]=='cdb') { // CDB currently supports only reading if (count($handler)==1) { die('skip CDB currently supports only reading'); } if ($handler[1]=='cdb_make' && count($handler)==2) { die('skip CDB currently supports only reading and creating'); } + $handler = $handler[1]; + } else { + $handler = $handler[0]; } - $HND = strtoupper($handler[0]); + $HND = strtoupper($handler); ?> diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc index e280226f68..402096dbe9 100644 --- a/ext/dba/tests/test.inc +++ b/ext/dba/tests/test.inc @@ -1,8 +1,9 @@ <?php $db_filename = $db_file = dirname(__FILE__).'/test0.dbm'; $handler = dba_handlers(); - // CDB currently supports only reading - if ($handler[0]=='cdb') { + if (in_array('flatfile', $handler)) { + $handler = 'flatfile'; + } elseif ($handler[0]=='cdb') { // CDB currently supports only reading if (count($handler)==1) { die('CDB currently supports only reading '); } |