Skip to content

Commit be59a3a

Browse files
MrDuartePTMrDuartePT
committed
add xwayland and wayland test to python GUI
* fix CI test for X11 being deprecated * add for future drop of X11 support in QT Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
1 parent 0a7feaf commit be59a3a

14 files changed

+33
-11
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ jobs:
6969
- name: Install Development Dependencies
7070
run: ./deploy/dependencies/install_development_dependencies_ubuntu.sh
7171
shell: bash
72+
- name: Install xwayland-run
73+
run: ./deploy/dependencies/install_xwayland-run.sh
74+
shell: bash
7275
- name: Lint with Linux checkpath
7376
if: always()
7477
run: ./tests/test_kernel_checkpath.sh

‎.github/workflows/build_PR.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
- name: Install Development Dependencies
5959
run: ./deploy/dependencies/install_development_dependencies_ubuntu.sh
6060
shell: bash
61+
- name: Install xwayland-run
62+
run: ./deploy/dependencies/install_xwayland-run.sh
63+
shell: bash
6164
- name: Lint with Linux checkpath
6265
if: always()
6366
run: ./tests/test_kernel_checkpath.sh

‎deploy/Dockerfile.arch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN deploy/dependencies/install_dependencies_arch.sh
2525

2626
COPY ./deploy/dependencies ./deploy/dependencies
2727
RUN deploy/dependencies/install_development_dependencies_arch.sh
28+
RUN deploy/dependencies/install_xwayland-run.sh
2829

2930
COPY . /opt/LinuxLegionLaptop
3031

@@ -35,4 +36,4 @@ RUN tests/test_python_cli.sh \
3536
RUN deploy/python_install_installer_pkg.sh \
3637
&& tests/test_python_cli_installed.sh \
3738
&& tests/test_python_gui_installed.sh
38-
#RUN tests/test_python_run_gui_root.sh
39+
#RUN tests/test_python_run_gui_root.sh

‎deploy/Dockerfile.fedora

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN deploy/dependencies/install_dependencies_fedora.sh
3333

3434
COPY ./deploy/dependencies ./deploy/dependencies
3535
RUN deploy/dependencies/install_development_dependencies_fedora.sh
36+
RUN deploy/dependencies/install_xwayland-run.sh
3637

3738
COPY . /opt/LinuxLegionLaptop
3839

‎deploy/Dockerfile.suse

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN deploy/dependencies/install_dependencies_suse.sh
2121

2222
COPY ./deploy/dependencies ./deploy/dependencies
2323
RUN deploy/dependencies/install_development_dependencies_suse.sh
24+
RUN deploy/dependencies/install_xwayland-run.sh
2425

2526
COPY . /opt/LinuxLegionLaptop
2627

@@ -31,4 +32,4 @@ RUN tests/test_python_cli.sh \
3132
RUN deploy/python_install_pip_pkg.sh \
3233
&& tests/test_python_cli_installed.sh \
3334
# && tests/test_python_gui_installed.sh
34-
#RUN tests/test_python_run_gui_root.sh
35+
#RUN tests/test_python_run_gui_root.sh

‎deploy/Dockerfile.ubuntu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN deploy/dependencies/install_dependencies_ubuntu.sh
2525

2626
COPY ./deploy/dependencies ./deploy/dependencies
2727
RUN deploy/dependencies/install_development_dependencies_ubuntu.sh
28+
RUN deploy/dependencies/install_xwayland-run.sh
2829

2930
COPY . /opt/LinuxLegionLaptop
3031

@@ -35,4 +36,4 @@ RUN tests/test_python_cli.sh \
3536
RUN deploy/python_install_pip_pkg.sh \
3637
&& tests/test_python_cli_installed.sh \
3738
&& tests/test_python_gui_installed.sh
38-
#RUN tests/test_python_run_gui_root.sh
39+
#RUN tests/test_python_run_gui_root.sh

‎deploy/dependencies/install_dependencies_arch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
set -ex
33
sudo pacman -S --disable-download-timeout --noconfirm linux-headers base-devel lm_sensors git dmidecode python-pyqt6 python-yaml python-argcomplete polkit python-build python-installer python-wheel python-setuptools
4-
sudo pacman -S --disable-download-timeout --noconfirm dkms openssl mokutil
4+
sudo pacman -S --disable-download-timeout --noconfirm dkms openssl mokutil meson weston xwayland

‎deploy/dependencies/install_dependencies_fedora.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set -ex
33
sudo dnf install -y kernel-headers kernel-devel dmidecode lm_sensors PyQt6 python3-yaml python3-pip python3-argcomplete python3-wheel polkit
44
sudo dnf groupinstall -y "Development Tools"
55
# sudo dnf group install -y "C Development Tools and Libraries"
6-
sudo dnf install -y dkms openssl mokutil
6+
sudo dnf install -y dkms openssl mokutil meson weston xwayland

‎deploy/dependencies/install_dependencies_suse.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ fi
1111
set -e
1212
# allow post-script install to fail (107) because it will try to update initramfs which is not possible inside container
1313
sudo zypper --non-interactive install python3-argcomplete
14-
sudo zypper --non-interactive install dkms openssl mokutil
14+
sudo zypper --non-interactive install dkms openssl mokutil menos weston xwayland

‎deploy/dependencies/install_dependencies_ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
set -ex
33
sudo apt-get update
44
sudo apt-get install -y make gcc linux-headers-$(uname -r) build-essential git lm-sensors wget python3-yaml python3-venv python3-pip python3-wheel python3-argcomplete policykit-1
5-
sudo apt-get install -y dkms openssl mokutil
5+
sudo apt-get install -y dkms openssl mokutil meson weston xwayland
66
sudo pip install PyQt6

‎deploy/dependencies/install_xwayland-run.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
cd /tmp
3+
git clone https://gitlab.freedesktop.org/ofourdan/xwayland-run.git
4+
cd xwayland-run
5+
meson setup --prefix=/usr -Dcompositor=weston . build
6+
sudo meson install -C build
7+
8+
#Fix wlheadless module not found
9+
export PYTHONPATH="${PYTHONPATH}:/usr/local/lib/python3/dist-packages"

‎deploy/package_testing/Dockerfile.suse

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN deploy/dependencies/install_dependencies_suse.sh
2121

2222
COPY ./deploy/dependencies ./deploy/dependencies
2323
RUN deploy/dependencies/install_development_dependencies_suse.sh
24+
RUN deploy/dependencies/install_xwayland-run.sh
2425

2526
COPY . /opt/LinuxLegionLaptop
2627

@@ -31,4 +32,4 @@ RUN tests/test_python_cli.sh \
3132
RUN deploy/python_install_pip_pkg.sh \
3233
&& tests/test_python_cli_installed.sh \
3334
# && tests/test_python_gui_installed.sh
34-
#RUN tests/test_python_run_gui_root.sh
35+
#RUN tests/test_python_run_gui_root.sh

‎tests/test_python_gui.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ set -ex
33
DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
44

55
# Smoketest GUI
6-
xvfb-run "${DIR}/../python/legion_linux/legion_linux/legion_gui.py" --automaticclose
6+
#xvfb-run "${DIR}/../python/legion_linux/legion_linux/legion_gui.py" --automaticclose
7+
xwayland-run :12 -- legion_gui --use_legion_cli_to_write --automaticclose

‎tests/test_python_gui_installed.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
set -ex
33
# Smoketest GUI
4-
xvfb-run "legion_gui" --automaticclose
5-
echo "Done"
4+
#xvfb-run "legion_gui" --automaticclose
5+
xwayland-run :12 -- legion_gui --use_legion_cli_to_write --automaticclose
6+
echo "Done"

0 commit comments

Comments
 (0)