Skip to content

Commit 4b746d8

Browse files
committed
Rework DBA tests
Improve testing, remove redundant ones Preliminary support for parallel runs
1 parent 9a7d37a commit 4b746d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1106
-938
lines changed

ext/dba/tests/bug36436.phpt

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@ Bug #36436 (DBA problem with Berkeley DB4)
44
dba
55
--SKIPIF--
66
<?php
7-
$handler = 'db4';
8-
require_once(__DIR__ .'/skipif.inc');
7+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
8+
check_skip('db4');
99
?>
1010
--FILE--
1111
<?php
12+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
13+
$db_name = 'bug36436.db';
1214

13-
$handler = 'db4';
14-
require_once(__DIR__ .'/test.inc');
15+
$db = set_up_db_ex('db4', $db_name, false, true);
1516

16-
$db = dba_popen($db_filename, 'c', 'db4');
17-
18-
dba_insert('X', 'XYZ', $db);
19-
dba_insert('Y', '123', $db);
20-
21-
var_dump($db, dba_fetch('X', $db));
17+
var_dump($db, dba_fetch('key1', $db));
2218

2319
var_dump(dba_firstkey($db));
2420
var_dump(dba_nextkey($db));
@@ -28,10 +24,12 @@ dba_close($db);
2824
?>
2925
--CLEAN--
3026
<?php
31-
require(__DIR__ .'/clean.inc');
27+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
28+
$db_name = 'bug36436.db';
29+
cleanup_standard_db($db_name);
3230
?>
3331
--EXPECTF--
3432
resource(%d) of type (dba persistent)
35-
string(3) "XYZ"
36-
string(1) "X"
37-
string(1) "Y"
33+
string(16) "Content String 1"
34+
string(13) "[key10]name10"
35+
string(13) "[key30]name30"

ext/dba/tests/bug48240.phpt

Lines changed: 0 additions & 28 deletions
This file was deleted.

ext/dba/tests/bug49125.phpt

Lines changed: 0 additions & 32 deletions
This file was deleted.

ext/dba/tests/bug62490.phpt

Lines changed: 0 additions & 43 deletions
This file was deleted.

ext/dba/tests/bug65708.phpt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on
44
dba
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ .'/skipif.inc');
7+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
8+
check_skip_any();
89
?>
910
--FILE--
1011
<?php
12+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
13+
$name = 'bug65708.db';
1114

12-
error_reporting(E_ALL);
13-
14-
require_once(__DIR__ .'/test.inc');
15-
16-
$db = dba_popen($db_filename, 'c');
15+
$db = get_any_db($name);
1716

1817
$key = 1;
1918
$copy = $key;
@@ -31,7 +30,9 @@ dba_close($db);
3130
?>
3231
--CLEAN--
3332
<?php
34-
require(__DIR__ .'/clean.inc');
33+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
34+
$db_name = 'bug65708.db';
35+
cleanup_standard_db($db_name);
3536
?>
3637
--EXPECT--
3738
integer

ext/dba/tests/bug72885.phpt

Lines changed: 0 additions & 28 deletions
This file was deleted.

ext/dba/tests/bug78808.phpt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ Bug #78808 ([LMDB] MDB_MAP_FULL: Environment mapsize limit reached)
44
dba
55
--SKIPIF--
66
<?php
7-
$handler = 'lmdb';
8-
require_once __DIR__ .'/skipif.inc';
7+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
8+
check_skip('lmdb');
99
?>
1010
--FILE--
1111
<?php
12-
$handler = 'lmdb';
13-
require_once __DIR__ .'/test.inc';
12+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
13+
$db_name = 'bug78808.db';
14+
1415
$value = str_repeat('*', 0x100000);
15-
$lmdb_h = dba_open($db_filename, 'c', 'lmdb', 0644, 5*1048576);
16+
$lmdb_h = dba_open($db_name, 'c', 'lmdb', 0644, 5*1048576);
1617
for ($i = 0; $i < 3; $i++) {
1718
dba_insert('key' . $i, $value, $lmdb_h);
1819
}
@@ -23,5 +24,7 @@ echo "done\n";
2324
done
2425
--CLEAN--
2526
<?php
26-
require_once dirname(__FILE__) .'/clean.inc';
27+
require_once __DIR__ . '/setup/setup_dba_tests.inc';
28+
$db_name = 'bug78808.db';
29+
cleanup_standard_db($db_name);
2730
?>

ext/dba/tests/dba001.phpt

Lines changed: 0 additions & 27 deletions
This file was deleted.

ext/dba/tests/dba002.phpt

Lines changed: 0 additions & 28 deletions
This file was deleted.

ext/dba/tests/dba003.phpt

Lines changed: 0 additions & 30 deletions
This file was deleted.

ext/dba/tests/dba004.phpt

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)