Skip to content

Commit 49240fd

Browse files
committed
ext/dba/tests/dba_tcadb.phpt: more lenient expected output
Several of our DBA tests (based on setup/setup_dba_tests.inc) have a "no lock" version whose expected output is, SAME OUTPUT AS PREVIOUS RUN (modulo read during write due to no lock) This particular tokyocabinet test, however, is missing the "modulo" bit, causing the lock-free test to fail when it is present. To complicate matters, on some machines (such as the Github CI) the "modulo" part is not output -- even in the lock-free scenario. To accommodate both, we use a wildcard on that line.
1 parent e85fb09 commit 49240fd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/dba/tests/dba_tcadb.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require_once __DIR__ . '/setup/setup_dba_tests.inc';
2323
$db_name = 'dba_tcadb.tch';
2424
cleanup_standard_db($db_name);
2525
?>
26-
--EXPECT--
26+
--EXPECTF--
2727
=== RUNNING WITH FILE LOCK ===
2828
Remove key 1 and 3
2929
bool(true)
@@ -71,4 +71,4 @@ array(6) {
7171
=== RUNNING WITH DB LOCK (default) ===
7272
SAME OUTPUT AS PREVIOUS RUN
7373
=== RUNNING WITH NO LOCK ===
74-
SAME OUTPUT AS PREVIOUS RUN
74+
SAME OUTPUT AS PREVIOUS RUN%S

0 commit comments

Comments
 (0)