diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-10-08 15:35:04 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-09 04:21:38 +0200 |
| commit | ebaf5b0ae6936add3348f1f235ec051f1edb8d13 (patch) | |
| tree | 4db32130b28223416d326bcf679a1d44d9a04393 /scripts/qt | |
| parent | 1c3eafe58e798185f5b328a778b1eaca1b5ea203 (diff) | |
Differentiate between failures and errors when aborting a test script
Previously, fatal_error() was the only way to abort a script with a
message to be understood by parse_build_log.pl; however, it makes sense
to differentiate between "failure" (we probably found a genuine problem
in the software under test) and "error" (something unexpected happened
which prevents us from continuing, probably unrelated to the software
under test).
The main reason to categorize problems as either failures or errors is
that it often makes sense to retry and/or notify some responsible CI
person on errors, but rarely makes sense to do that on failures.
Change-Id: I3b4d71f0431ed06b864b6f576658ada097f13e33
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index a5aa2d2b..49b16624 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -569,7 +569,7 @@ sub read_dependencies ($action, $error) = ('execute', $!); } if ($error) { - $self->fatal_error( + $self->fail( "I couldn't $action $dependency_file, which I need to determine dependencies.\n" ."The error was $error\n" ); @@ -1059,7 +1059,7 @@ sub run_install_check my @required_files = map { "$qt_install_dir/$_" } qw(bin include); my @missing_files = grep { ! -e $_ } @required_files; if (@missing_files) { - $self->fatal_error( + $self->fail( 'The make install command exited successfully, but the following expected file(s) ' .'are missing from the install tree:'.join("\n ", q{}, @missing_files)."\n" ); |