merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
321 changed files with 10644 additions and 30743 deletions
Showing only changes of commit 778a9b3d3d - Show all commits

View File

@@ -59,6 +59,7 @@ add_project_arguments([
'-Wno-unused-parameter',
], language: 'c')
analyzer_args = []
if is_debug
add_project_arguments([
'-ggdb3',
@@ -71,7 +72,7 @@ if is_debug
'-Wpointer-arith'
], language: 'c')
if cc.get_id() == 'gcc'
add_project_arguments('-fanalyzer', language: 'c')
analyzer_args += '-fanalyzer'
endif
endif
@@ -501,6 +502,7 @@ profanity_exe = executable(
profanity_sources,
files('src/main.c'),
config_h,
c_args: analyzer_args,
dependencies: profanity_deps,
include_directories: inc,
install: true,
@@ -710,7 +712,7 @@ if get_option('tests')
build_by_default: false,
)
test('functional tests', functionaltests)
test('functional tests', functionaltests, timeout: 1800)
endif
else
warning('cmocka not found, tests will not be built')

View File

@@ -298,9 +298,9 @@ init_prof_test(void** state)
prof_start();
usleep(1000 * 500); // Wait for profanity to start
prof_expect_timeout = 30;
assert_true(prof_output_regex("Profanity"));
prof_expect_timeout = 30;
// set UI options to make expect assertions faster and more reliable
prof_input("/inpblock timeout 5");
prof_output_regex("Input blocking set to 5 milliseconds");