| Message ID | 1464762012-21101-2-git-send-email-ldoktor@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01.06.2016 08:20, Lukáš Doktor wrote: > The premature_failure check fails on qemu-system-ppc64 as it uses > different message. This patch modifies the condition so it works > (hopefully) for all archs. (tested on x86_64, ppc64, aarch64) > > Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> > --- > scripts/runtime.bash | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/scripts/runtime.bash b/scripts/runtime.bash > index 6c4c800..0503cf0 100644 > --- a/scripts/runtime.bash > +++ b/scripts/runtime.bash > @@ -15,14 +15,14 @@ extract_summary() > premature_failure() > { > local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)" > - local last_line=$(tail -1 <<< "$log") > > - echo "$last_line" | grep -qi "could not load kernel" && > + echo "$log" | grep "_NO_FILE_4Uhere_" | > + grep -q -e "could not load kernel" -e "error loading" && > return 1 > > RUNTIME_log_stderr <<< "$log" > > - echo "$last_line" > + echo "$log" > return 0 > } > Reviewed-by: Thomas Huth <thuth@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 13/06/2016 11:34, Thomas Huth wrote:
> Reviewed-by: Thomas Huth <thuth@redhat.com>
Applied, thanks.
paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 6c4c800..0503cf0 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -15,14 +15,14 @@ extract_summary() premature_failure() { local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)" - local last_line=$(tail -1 <<< "$log") - echo "$last_line" | grep -qi "could not load kernel" && + echo "$log" | grep "_NO_FILE_4Uhere_" | + grep -q -e "could not load kernel" -e "error loading" && return 1 RUNTIME_log_stderr <<< "$log" - echo "$last_line" + echo "$log" return 0 }
The premature_failure check fails on qemu-system-ppc64 as it uses different message. This patch modifies the condition so it works (hopefully) for all archs. (tested on x86_64, ppc64, aarch64) Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> --- scripts/runtime.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)