From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Tue, 20 Feb 2018 12:01:40 +0000 (+0000)
Subject: test/test-functions: on PPC64 use hvc0 console
X-Git-Tag: v241-rc1~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11545%2Fhead;p=thirdparty%2Fsystemd.git

test/test-functions: on PPC64 use hvc0 console
---

diff --git a/test/test-functions b/test/test-functions
index ac575ade7ee..cb83761a6c3 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -99,6 +99,8 @@ run_qemu() {
             && KERNEL_BIN="$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/linux"
     fi
 
+    CONSOLE=ttyS0
+
     if [[ ! "$KERNEL_BIN" ]]; then
         if [[ "$LOOKS_LIKE_ARCH" ]]; then
             KERNEL_BIN=/boot/vmlinuz-linux
@@ -107,6 +109,7 @@ run_qemu() {
             case $ARCH in
                 ppc64*)
                 KERNEL_BIN=/boot/vmlinux-$KERNEL_VER
+                CONSOLE=hvc0
                 ;;
                 *)
                 KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER
@@ -158,7 +161,7 @@ root=/dev/sda1 \
 raid=noautodetect \
 loglevel=2 \
 init=$PATH_TO_INIT \
-console=ttyS0 \
+console=$CONSOLE \
 selinux=0 \
 printk.devkmsg=on \
 $_cgroup_args \