Skip to content

Commit

Permalink
check_parameters.php: Make the script's retval reflect errors
Browse files Browse the repository at this point in the history
When the check_parameters.php script meets an error it prints it
out but the exit value is not affected, it's still 0. This does
not fly with projects that want to run this script as a part of
their test suite.

Therefore, make the script return 0 on success and 2 if any error
was reported.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Closes GH-8790.
  • Loading branch information
zippy2 committed Jun 16, 2022
1 parent f25afaf commit a87f4dd
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion scripts/dev/check_parameters.php
Expand Up @@ -51,7 +51,7 @@
/** reports an error, according to its level */
function error($str, $level = 0)
{
global $current_file, $current_function, $line;
global $current_file, $current_function, $line, $error_reported;

if ($level <= REPORT_LEVEL) {
if (strpos($current_file,PHPDIR) === 0) {
Expand All @@ -60,6 +60,7 @@ function error($str, $level = 0)
$filename = $current_file;
}
echo $filename , " [$line] $current_function : $str\n";
$error_reported = true;
}
}

Expand Down Expand Up @@ -372,6 +373,9 @@ function recurse($path)
}
}

$error_reported = false;
foreach ($dirs as $dir) {
recurse(realpath($dir));
}

exit($error_reported === false ? 0 : 2);

0 comments on commit a87f4dd

Please sign in to comment.