Skip to content

Commit 4140394

Browse files
authored
ext/dba/tests/dba_tcadb.phpt: support pthreadless tokyocabinet (php#11648)
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 tokyocabinet test, however, is missing the "modulo" bit, because it is not output when tokyocabinet is built with pthreads support, as is the case on at least Fedora and the GitHub CI. To additionally support systems where tokyocabinet is built WITHOUT pthreads support, this commit adds a wildcard at the end of the expected output to catch the " (modulo..." string.
1 parent 66b359e commit 4140394

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)