From ebaf5b0ae6936add3348f1f235ec051f1edb8d13 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 8 Oct 2012 15:35:04 +1000 Subject: 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 Reviewed-by: Janne Anttila Reviewed-by: Rohan McGovern --- scripts/qt/qtmod_test.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/qt') 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" ); -- cgit v1.2.3