Commit c32e3e56 authored by Harald Sitter's avatar Harald Sitter

don't assert evdev on xenial

it's the only possible default anyway, so checking it is moot. also the
package name is different and I can't be asked to write code to mutate
the package name between series. so, simply run the check only on bionic.
parent 40cd668f
......@@ -236,9 +236,11 @@ sub boot {
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
if (get_var('OPENQA_SERIES') ne 'xenial') {
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
}
# TODO: maybe control via env var?
# assert_script_run 'wget ' . data_url('enable_qdebug.rb'), 16;
......
......@@ -47,9 +47,11 @@ sub run {
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
if (get_var('OPENQA_SERIES') ne 'xenial') {
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
}
# Assert that we have no preinstalled pool lingering around on the installed
# rootfs. preinstalled-pool comes from our livecd-rootfs-neon fork and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment