Merge pull request #234 from stgraber/master

Fix test_proc on s390x

diff --git a/tests/test_proc b/tests/test_proc
index 1ba1a149716f0088a47e1aead7caa6db1ac24a21..8e5b77de2f16e9e74c10751b83f3ef42d5f58f8f 100755 (executable)
--- 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" ]