diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-01-26 13:55:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 13:55:32 +0100 |
| commit | b3f259d0566bdac1af2987dd316e312c0557edf9 (patch) | |
| tree | 6386fa29b1f2488132ea1bd0d508d558279a07a0 | |
| parent | units: drop conditionalization of systemd-tmpfiles-setup-dev.service (diff) | |
| parent | test/test-functions: on PPC64 use hvc0 console (diff) | |
| download | systemd-b3f259d0566bdac1af2987dd316e312c0557edf9.tar.xz systemd-b3f259d0566bdac1af2987dd316e312c0557edf9.zip | |
Merge pull request #11545 from xnox/ppc64el
test-functions: fixup PPC64 testing
| -rw-r--r-- | test/test-functions | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/test/test-functions b/test/test-functions index a8c7949668..cb83761a6c 100644 --- a/test/test-functions +++ b/test/test-functions @@ -99,11 +99,22 @@ 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 else - KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER + [ "$ARCH" ] || ARCH=$(uname -m) + case $ARCH in + ppc64*) + KERNEL_BIN=/boot/vmlinux-$KERNEL_VER + CONSOLE=hvc0 + ;; + *) + KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER + ;; + esac fi fi @@ -150,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 \ |