diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-02-20 13:01:40 +0100 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-01-26 01:21:08 +0100 |
| commit | 9a2e265bb00f0f6ab56517627a96b281d6232e3a (patch) | |
| tree | 3694526e29a7a92dfd59cc877887762da2d86815 /test | |
| parent | test/test-functions: on PP64 use vmlinux (diff) | |
| download | systemd-9a2e265bb00f0f6ab56517627a96b281d6232e3a.tar.xz systemd-9a2e265bb00f0f6ab56517627a96b281d6232e3a.zip | |
test/test-functions: on PPC64 use hvc0 console
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index ac575ade7e..cb83761a6c 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 \ |