From 2b949a93d32cef6631e8ebf075ac4517722ff425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 24 Jul 2018 09:50:19 +0200
Subject: [PATCH] smoketest: Ignore warning from g-s-d and other components
We're only interested in phosh's criticals and warnings so adjust
the corresponding greps.
---
tests/smoke | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/smoke b/tests/smoke
index f845f366d..32348d85c 100755
--- a/tests/smoke
+++ b/tests/smoke
@@ -137,7 +137,7 @@ import -display "${DISPLAY}" -window root "${OUTDIR}"/empty.png
echo "Started/stopped phosh successfully"
RET=0
-if grep -qs "WARNING" "${PHOSH_LOG}"; then
+if grep -qs "phosh.*WARNING" "${PHOSH_LOG}"; then
echo "Found warning log messages" 1>&2
# We're having warnings due to missing DBus
# services and gnome-session depending on X11.
@@ -145,7 +145,7 @@ if grep -qs "WARNING" "${PHOSH_LOG}"; then
#RET=1
fi
-if grep -qs "CRITICAL" "${PHOSH_LOG}"; then
+if grep -qs "phosh.*CRITICAL" "${PHOSH_LOG}"; then
echo "Found critical log messages" 1>&2
RET=1
fi
--
GitLab