Commit 22522410 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'bugfix/14948-avoid-zombies-in-testsuite-runs+force-all-tests'...

Merge branch 'bugfix/14948-avoid-zombies-in-testsuite-runs+force-all-tests' into stable (Closes: #14948)
parents de574442 a7022e22
......@@ -178,7 +178,8 @@ def chutney_onionservice_redir(remote_address, remote_port)
"--unit=#{redir_unit_name}",
'--service-type=forking',
'--quiet',
# XXX: enable this once we require Buster or newer for running our test suite
# XXX: enable this once we require systemd v236 or newer
# for running our test suite
# '--collect',
'/usr/bin/redir',
"#{local_address}:#{local_port}",
......
......@@ -43,7 +43,10 @@ def pattern_coverage_in_guest_ram(reference_memory_b)
FileUtils.touch(dump)
FileUtils.chmod(0666, dump)
$vm.domain.core_dump(dump)
patterns = IO.popen(['grep', '--text', '-c', 'wipe_didnt_work', dump]).gets.to_i
# Make sure to close after reading stdout, to avoid Zombies:
grep = IO.popen(['grep', '--text', '-c', 'wipe_didnt_work', dump])
patterns = grep.gets.to_i
grep.close
File.delete dump
# Pattern is 16 bytes long
patterns_b = patterns*16
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment