From: "Lukáš Doktor" <ldoktor@redhat.com>
To: kvm@vger.kernel.org, drjones@redhat.com, pbonzini@redhat.com,
lvivier@redhat.com, ldoktor@redhat.com, rkrcmar@redhat.com
Subject: [PATCH] scripts/runtime: Adjust the premature_failure check
Date: Wed, 1 Jun 2016 08:20:12 +0200 [thread overview]
Message-ID: <1464762012-21101-2-git-send-email-ldoktor@redhat.com> (raw)
In-Reply-To: <1464762012-21101-1-git-send-email-ldoktor@redhat.com>
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
}
--
2.5.5
next prev parent reply other threads:[~2016-06-01 6:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 6:20 [kvm-unit-tests PATCH v2] Adjust the premature_failure check Lukáš Doktor
2016-06-01 6:20 ` Lukáš Doktor [this message]
2016-06-13 9:34 ` [kvm-unit-tests PATCH] scripts/runtime: " Thomas Huth
2016-06-13 13:30 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2016-05-31 10:54 [kvm-unit-tests PATCH] " Lukáš Doktor
2016-05-31 10:54 ` [PATCH] scripts/runtime: " Lukáš Doktor
2016-05-31 15:37 ` Radim Krčmář
2016-05-31 15:56 ` Radim Krčmář
2016-05-31 16:20 ` Paolo Bonzini
2016-05-31 18:13 ` Lukáš Doktor
2016-05-31 19:00 ` Radim Krčmář
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464762012-21101-2-git-send-email-ldoktor@redhat.com \
--to=ldoktor@redhat.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox