Skip to content

Commit bdd7c48

Browse files
MaxSemnikic
authored andcommitted
run-tests: drop support for ancient Valgrind versions
Valgrind 3.3.0 was released in 2007, not even RHEL has crap older than this. It could be argued that 3.8.0, released in 2012, could be a safe cutoff too. Closes phpGH-6728.
1 parent 1ec7cc9 commit bdd7c48

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

run-tests.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3792,7 +3792,6 @@ class RuntestsValgrind
37923792
{
37933793
protected $version = '';
37943794
protected $header = '';
3795-
protected $version_3_3_0 = false;
37963795
protected $version_3_8_0 = false;
37973796
protected $tool = null;
37983797

@@ -3822,7 +3821,6 @@ public function __construct(array $environment, string $tool = 'memcheck')
38223821
$this->version = $version;
38233822
$this->header = sprintf(
38243823
"%s (%s)", trim($header), $this->tool);
3825-
$this->version_3_3_0 = version_compare($version, '3.3.0', '>=');
38263824
$this->version_3_8_0 = version_compare($version, '3.8.0', '>=');
38273825
}
38283826

@@ -3835,13 +3833,9 @@ public function wrapCommand(string $cmd, string $memcheck_filename, bool $check_
38353833

38363834
/* --vex-iropt-register-updates=allregs-at-mem-access is necessary for phpdbg watchpoint tests */
38373835
if ($this->version_3_8_0) {
3838-
/* valgrind 3.3.0+ doesn't have --log-file-exactly option */
38393836
return "$vcmd --vex-iropt-register-updates=allregs-at-mem-access --log-file=$memcheck_filename $cmd";
3840-
} elseif ($this->version_3_3_0) {
3841-
return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd";
3842-
} else {
3843-
return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file-exactly=$memcheck_filename $cmd";
38443837
}
3838+
return "$vcmd --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd";
38453839
}
38463840
}
38473841

0 commit comments

Comments
 (0)