From 414039464257dd6e835ff42ea31d1e616aae3f88 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 2 Aug 2023 11:50:02 -0400 Subject: [PATCH] ext/dba/tests/dba_tcadb.phpt: support pthreadless tokyocabinet (#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. --- ext/dba/tests/dba_tcadb.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt index 6459c5b372e..d0a0e34cb8e 100644 --- a/ext/dba/tests/dba_tcadb.phpt +++ b/ext/dba/tests/dba_tcadb.phpt @@ -23,7 +23,7 @@ require_once __DIR__ . '/setup/setup_dba_tests.inc'; $db_name = 'dba_tcadb.tch'; cleanup_standard_db($db_name); ?> ---EXPECT-- +--EXPECTF-- === RUNNING WITH FILE LOCK === Remove key 1 and 3 bool(true) @@ -71,4 +71,4 @@ array(6) { === RUNNING WITH DB LOCK (default) === SAME OUTPUT AS PREVIOUS RUN === RUNNING WITH NO LOCK === -SAME OUTPUT AS PREVIOUS RUN +SAME OUTPUT AS PREVIOUS RUN%S