Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to start_wayland_plasma5 #5496

Merged
merged 2 commits into from
Aug 1, 2018
Merged

Improvements to start_wayland_plasma5 #5496

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8016c6e
Remove workaround in start_wayland_plasma5
Vogtinator Aug 1, 2018
de73ffe
Infer the plasma wayland session's tty by using XDG_VTNR
Vogtinator Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions tests/x11/start_wayland_plasma5.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ sub run {
# Make sure everything necessary is installed
ensure_installed "plasma5-session-wayland";

# Workaround (part 1): use softpipe as llvmpipe crashes all the time (fdo#96953)
x11_start_program('mkdir -p ~/.config/plasma-workspace/env', valid => 0);
x11_start_program("echo 'echo export GALLIUM_DRIVER=softpipe >> ~/.config/startupconfig' > ~/.config/plasma-workspace/env/softpipe.sh", valid => 0);

# Log out of X session
send_key 'super'; # Open the application menu
assert_and_click 'plasma_logout_btn'; # Click on the logout button
Expand All @@ -42,11 +38,11 @@ sub run {
assert_screen 'generic-desktop', 60;

# We're now in a wayland session, which is in a different VT
console('x11')->{args}->{tty} = 3;
x11_start_program('xterm');
my $tty = script_output('echo $XDG_VTNR');
send_key("alt-f4"); # close xterm

# Workaround (part 2): KWin does not work with the workaround so we need to undo it
# to allow relogins to succeed
x11_start_program('rm ~/.config/startupconfig', valid => 0);
console('x11')->set_tty(int($tty));
}

sub test_flags {
Expand Down