[lxc-devel] [lxcfs/master] Fix test_proc on s390x

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 355 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180302/e5c80e53/attachment.bin>
-------------- next part --------------
From 3137a0a63db273005d62973a5d055a7623e98631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 2 Mar 2018 17:13:47 -0500
Subject: [PATCH] Fix test_proc on s390x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 tests/test_proc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_proc b/tests/test_proc
index 1ba1a14..8e5b77d 100755
--- a/tests/test_proc
+++ b/tests/test_proc
@@ -40,7 +40,7 @@ echo 0 > ${cpupath}/lxcfs_test_proc/cpuset.cpus
 
 # Test cpuinfo
 [ "$(grep "^processor" ${LXCFSDIR}/proc/cpuinfo | wc -l)" = "1" ]
-grep -q "^processor.*0$" ${LXCFSDIR}/proc/cpuinfo
+grep -q "^processor.*0$" ${LXCFSDIR}/proc/cpuinfo || grep -q "^processor 0:.*" ${LXCFSDIR}/proc/cpuinfo
 
 # Test stat
 [ "$(grep "^cpu" ${LXCFSDIR}/proc/stat | wc -l)" = "2" ]