Commit37bbde5

authored

Merge branch '3.14' into backport-8598e57-3.14

2 parents918c083 +5e730a8 commit37bbde5Copy full SHA for 37bbde5

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,10 @@ def get_syscalls(code, strace_flags, prelude="", cleanup="",`
`178`	`178`	`# Moderately expensive (spawns a subprocess), so share results when possible.`
`179`	`179`	`@cache`
`180`	`180`	`def_can_strace():`
`181`		`-res=strace_python("import sys; sys.exit(0)", [],check=False)`
	`181`	`+res=strace_python("import sys; sys.exit(0)",`
	`182`	`+# --trace option needs strace 5.5 (gh-133741)`
	`183`	`+ ["--trace=%process"],`
	`184`	`+check=False)`
`182`	`185`	`ifres.strace_returncode==0andres.python_returncode==0:`
`183`	`186`	`assertres.events(),"Should have parsed multiple calls"`
`184`	`187`	`returnTrue`

Comments

(0)