test: Pass personality test even when i686 userland runs on x86_64 kernel

(cherry picked from commit bd89d03544d2b8ea53af7af0a97d4d121ef048c4)
(cherry picked from commit ef677436aa203c24816021dd698b57f219f0ff64)

Gbp-Pq: Name test-Pass-personality-test-even-when-i686-userland-runs-o.patch

diff --git a/test/test-execute/exec-personality-x86.service b/test/test-execute/exec-personality-x86.service
index a623a08cbedaad967afaec5d5632e172428bf067..4ece7de718e794e6078283cd2e1fa73a5d3cf31d 100644 (file)
--- a/test/test-execute/exec-personality-x86.service
+++ b/test/test-execute/exec-personality-x86.service
@@ -2,6 +2,6 @@
 Description=Test for Personality=x86
 
 [Service]
-ExecStart=/bin/sh -x -c 'c=$$(uname -m); test "$$c" = "i686"'
+ExecStart=/bin/sh -x -c 'c=$$(uname -m); test "$$c" = "i686" -o "$$c" = "x86_64"'
 Type=oneshot
 Personality=x86