diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f841b3a..ee16051 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -89,7 +89,7 @@ jobs: - name: Download Dependencies run: | sudo apt update -qq - sudo apt install gettext -qq + sudo apt install gettext imagemagick -qq - name: Build Burn-My-Windows run: make - name: Generate References @@ -115,6 +115,7 @@ jobs: - '34' - '35' - '36' + - '37' session: - 'gnome-xsession' - 'gnome-wayland-nested' diff --git a/Makefile b/Makefile index 8b8831e..ba8fdbc 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ pot: $(JS_FILES) $(UI_FILES) # This runs several tests in containerized versions of GNOME Shell. test: - @ for version in 32 33 34 35 36 ; do \ + @ for version in 32 33 34 35 36 37 ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Running Tests on Fedora $$version ($$session)." ; \ @@ -57,7 +57,7 @@ test: # This re-generates all reference images required by the tests. references: - @ for version in 32 33 34 35 36 ; do \ + @ for version in 32 33 34 35 36 37 ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Generating References for Fedora $$version ($$session)." ; \ diff --git a/tests/generate-references.sh b/tests/generate-references.sh index 7032b04..81a3210 100755 --- a/tests/generate-references.sh +++ b/tests/generate-references.sh @@ -27,6 +27,8 @@ # -v 33: GNOME Shell 3.38 # -v 34: GNOME Shell 40 # -v 35: GNOME Shell 41 +# -v 36: GNOME Shell 42 +# -v 37: GNOME Shell 43 # -s session: This can either be "gnome-xsession" or "gnome-wayland-nested". # Exit on error. @@ -96,8 +98,7 @@ set_setting() { # This makes a screen capture (cropped to $CROP) inside the container and stores it # on the host relative to this script with the given file name. capture() { - do_in_pod import -window root -crop $CROP out.png - podman cp "${POD}":/home/gnomeshell/out.png "${1}" + podman cp "${POD}:/opt/Xvfb_screen0" - | tar xf - --to-command "convert xwd:- -crop ${CROP} ${1}" } # This opens the extensions preferences dialog and captures two images: One during the @@ -134,11 +135,6 @@ podman cp "${EXTENSION}.zip" "${POD}:/home/gnomeshell" do_in_pod gnome-extensions install "${EXTENSION}.zip" -# ----------------------- install gnome-terminal (this is used for testing the animations) - -do_in_pod sudo dnf install -y gnome-terminal - - # ---------------------------------------------------------------------- start GNOME Shell # Starting with GNOME 40, there is a "Welcome Tour" dialog popping up at first launch. diff --git a/tests/references/apparition-close-gnome-wayland-nested-37.png b/tests/references/apparition-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..dad1d8e Binary files /dev/null and b/tests/references/apparition-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/apparition-close-gnome-xsession-37.png b/tests/references/apparition-close-gnome-xsession-37.png new file mode 100644 index 0000000..c84fab7 Binary files /dev/null and b/tests/references/apparition-close-gnome-xsession-37.png differ diff --git a/tests/references/apparition-open-gnome-wayland-nested-37.png b/tests/references/apparition-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..3dbb2d4 Binary files /dev/null and b/tests/references/apparition-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/apparition-open-gnome-xsession-37.png b/tests/references/apparition-open-gnome-xsession-37.png new file mode 100644 index 0000000..6fca93e Binary files /dev/null and b/tests/references/apparition-open-gnome-xsession-37.png differ diff --git a/tests/references/broken-glass-close-gnome-wayland-nested-37.png b/tests/references/broken-glass-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..f8a4b8c Binary files /dev/null and b/tests/references/broken-glass-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/broken-glass-close-gnome-xsession-37.png b/tests/references/broken-glass-close-gnome-xsession-37.png new file mode 100644 index 0000000..5a6ddc8 Binary files /dev/null and b/tests/references/broken-glass-close-gnome-xsession-37.png differ diff --git a/tests/references/broken-glass-open-gnome-wayland-nested-37.png b/tests/references/broken-glass-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..1db8663 Binary files /dev/null and b/tests/references/broken-glass-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/broken-glass-open-gnome-xsession-37.png b/tests/references/broken-glass-open-gnome-xsession-37.png new file mode 100644 index 0000000..db4a12b Binary files /dev/null and b/tests/references/broken-glass-open-gnome-xsession-37.png differ diff --git a/tests/references/doom-close-gnome-wayland-nested-37.png b/tests/references/doom-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..b56e018 Binary files /dev/null and b/tests/references/doom-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/doom-close-gnome-xsession-37.png b/tests/references/doom-close-gnome-xsession-37.png new file mode 100644 index 0000000..a4aa918 Binary files /dev/null and b/tests/references/doom-close-gnome-xsession-37.png differ diff --git a/tests/references/doom-open-gnome-wayland-nested-37.png b/tests/references/doom-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..107aa7d Binary files /dev/null and b/tests/references/doom-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/doom-open-gnome-xsession-37.png b/tests/references/doom-open-gnome-xsession-37.png new file mode 100644 index 0000000..7cb2f11 Binary files /dev/null and b/tests/references/doom-open-gnome-xsession-37.png differ diff --git a/tests/references/energize-a-close-gnome-wayland-nested-37.png b/tests/references/energize-a-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..5ebcab1 Binary files /dev/null and b/tests/references/energize-a-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/energize-a-close-gnome-xsession-37.png b/tests/references/energize-a-close-gnome-xsession-37.png new file mode 100644 index 0000000..5e88e15 Binary files /dev/null and b/tests/references/energize-a-close-gnome-xsession-37.png differ diff --git a/tests/references/energize-a-open-gnome-wayland-nested-37.png b/tests/references/energize-a-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..f15850f Binary files /dev/null and b/tests/references/energize-a-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/energize-a-open-gnome-xsession-37.png b/tests/references/energize-a-open-gnome-xsession-37.png new file mode 100644 index 0000000..54534bb Binary files /dev/null and b/tests/references/energize-a-open-gnome-xsession-37.png differ diff --git a/tests/references/energize-b-close-gnome-wayland-nested-37.png b/tests/references/energize-b-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..7d6d509 Binary files /dev/null and b/tests/references/energize-b-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/energize-b-close-gnome-xsession-37.png b/tests/references/energize-b-close-gnome-xsession-37.png new file mode 100644 index 0000000..baf3fe4 Binary files /dev/null and b/tests/references/energize-b-close-gnome-xsession-37.png differ diff --git a/tests/references/energize-b-open-gnome-wayland-nested-37.png b/tests/references/energize-b-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..8a71ae0 Binary files /dev/null and b/tests/references/energize-b-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/energize-b-open-gnome-xsession-37.png b/tests/references/energize-b-open-gnome-xsession-37.png new file mode 100644 index 0000000..6c51a8d Binary files /dev/null and b/tests/references/energize-b-open-gnome-xsession-37.png differ diff --git a/tests/references/fire-close-gnome-wayland-nested-37.png b/tests/references/fire-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..fd33c86 Binary files /dev/null and b/tests/references/fire-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/fire-close-gnome-xsession-37.png b/tests/references/fire-close-gnome-xsession-37.png new file mode 100644 index 0000000..0da0457 Binary files /dev/null and b/tests/references/fire-close-gnome-xsession-37.png differ diff --git a/tests/references/fire-open-gnome-wayland-nested-37.png b/tests/references/fire-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..6f45617 Binary files /dev/null and b/tests/references/fire-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/fire-open-gnome-xsession-37.png b/tests/references/fire-open-gnome-xsession-37.png new file mode 100644 index 0000000..7fc996f Binary files /dev/null and b/tests/references/fire-open-gnome-xsession-37.png differ diff --git a/tests/references/glide-close-gnome-wayland-nested-37.png b/tests/references/glide-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..a805c2d Binary files /dev/null and b/tests/references/glide-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/glide-close-gnome-xsession-37.png b/tests/references/glide-close-gnome-xsession-37.png new file mode 100644 index 0000000..5e6819b Binary files /dev/null and b/tests/references/glide-close-gnome-xsession-37.png differ diff --git a/tests/references/glide-open-gnome-wayland-nested-37.png b/tests/references/glide-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..6331b20 Binary files /dev/null and b/tests/references/glide-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/glide-open-gnome-xsession-37.png b/tests/references/glide-open-gnome-xsession-37.png new file mode 100644 index 0000000..6c7f74a Binary files /dev/null and b/tests/references/glide-open-gnome-xsession-37.png differ diff --git a/tests/references/hexagon-close-gnome-wayland-nested-37.png b/tests/references/hexagon-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..537a175 Binary files /dev/null and b/tests/references/hexagon-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/hexagon-close-gnome-xsession-37.png b/tests/references/hexagon-close-gnome-xsession-37.png new file mode 100644 index 0000000..fe10bd9 Binary files /dev/null and b/tests/references/hexagon-close-gnome-xsession-37.png differ diff --git a/tests/references/hexagon-open-gnome-wayland-nested-37.png b/tests/references/hexagon-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..1ebef73 Binary files /dev/null and b/tests/references/hexagon-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/hexagon-open-gnome-xsession-37.png b/tests/references/hexagon-open-gnome-xsession-37.png new file mode 100644 index 0000000..22c0a01 Binary files /dev/null and b/tests/references/hexagon-open-gnome-xsession-37.png differ diff --git a/tests/references/incinerate-close-gnome-wayland-nested-37.png b/tests/references/incinerate-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..c2df92c Binary files /dev/null and b/tests/references/incinerate-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/incinerate-close-gnome-xsession-37.png b/tests/references/incinerate-close-gnome-xsession-37.png new file mode 100644 index 0000000..075eaa7 Binary files /dev/null and b/tests/references/incinerate-close-gnome-xsession-37.png differ diff --git a/tests/references/incinerate-open-gnome-wayland-nested-37.png b/tests/references/incinerate-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..cc61aec Binary files /dev/null and b/tests/references/incinerate-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/incinerate-open-gnome-xsession-37.png b/tests/references/incinerate-open-gnome-xsession-37.png new file mode 100644 index 0000000..a817605 Binary files /dev/null and b/tests/references/incinerate-open-gnome-xsession-37.png differ diff --git a/tests/references/matrix-close-gnome-wayland-nested-37.png b/tests/references/matrix-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..1aa0789 Binary files /dev/null and b/tests/references/matrix-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/matrix-close-gnome-xsession-37.png b/tests/references/matrix-close-gnome-xsession-37.png new file mode 100644 index 0000000..02a7b47 Binary files /dev/null and b/tests/references/matrix-close-gnome-xsession-37.png differ diff --git a/tests/references/matrix-open-gnome-wayland-nested-37.png b/tests/references/matrix-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..2d6af4a Binary files /dev/null and b/tests/references/matrix-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/matrix-open-gnome-xsession-37.png b/tests/references/matrix-open-gnome-xsession-37.png new file mode 100644 index 0000000..6af07e3 Binary files /dev/null and b/tests/references/matrix-open-gnome-xsession-37.png differ diff --git a/tests/references/pixel-wheel-close-gnome-wayland-nested-37.png b/tests/references/pixel-wheel-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..0462991 Binary files /dev/null and b/tests/references/pixel-wheel-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixel-wheel-close-gnome-xsession-37.png b/tests/references/pixel-wheel-close-gnome-xsession-37.png new file mode 100644 index 0000000..e6ddc02 Binary files /dev/null and b/tests/references/pixel-wheel-close-gnome-xsession-37.png differ diff --git a/tests/references/pixel-wheel-open-gnome-wayland-nested-37.png b/tests/references/pixel-wheel-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..5b9cd5d Binary files /dev/null and b/tests/references/pixel-wheel-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixel-wheel-open-gnome-xsession-37.png b/tests/references/pixel-wheel-open-gnome-xsession-37.png new file mode 100644 index 0000000..c814653 Binary files /dev/null and b/tests/references/pixel-wheel-open-gnome-xsession-37.png differ diff --git a/tests/references/pixel-wipe-close-gnome-wayland-nested-37.png b/tests/references/pixel-wipe-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..390ac56 Binary files /dev/null and b/tests/references/pixel-wipe-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixel-wipe-close-gnome-xsession-37.png b/tests/references/pixel-wipe-close-gnome-xsession-37.png new file mode 100644 index 0000000..af5d687 Binary files /dev/null and b/tests/references/pixel-wipe-close-gnome-xsession-37.png differ diff --git a/tests/references/pixel-wipe-open-gnome-wayland-nested-37.png b/tests/references/pixel-wipe-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..e9a10ce Binary files /dev/null and b/tests/references/pixel-wipe-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixel-wipe-open-gnome-xsession-37.png b/tests/references/pixel-wipe-open-gnome-xsession-37.png new file mode 100644 index 0000000..ea0678d Binary files /dev/null and b/tests/references/pixel-wipe-open-gnome-xsession-37.png differ diff --git a/tests/references/pixelate-close-gnome-wayland-nested-37.png b/tests/references/pixelate-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..cc7f364 Binary files /dev/null and b/tests/references/pixelate-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixelate-close-gnome-xsession-37.png b/tests/references/pixelate-close-gnome-xsession-37.png new file mode 100644 index 0000000..5434491 Binary files /dev/null and b/tests/references/pixelate-close-gnome-xsession-37.png differ diff --git a/tests/references/pixelate-open-gnome-wayland-nested-37.png b/tests/references/pixelate-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..28ed3be Binary files /dev/null and b/tests/references/pixelate-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/pixelate-open-gnome-xsession-37.png b/tests/references/pixelate-open-gnome-xsession-37.png new file mode 100644 index 0000000..27a3635 Binary files /dev/null and b/tests/references/pixelate-open-gnome-xsession-37.png differ diff --git a/tests/references/portal-close-gnome-wayland-nested-37.png b/tests/references/portal-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..78fc3fd Binary files /dev/null and b/tests/references/portal-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/portal-close-gnome-xsession-37.png b/tests/references/portal-close-gnome-xsession-37.png new file mode 100644 index 0000000..034ee12 Binary files /dev/null and b/tests/references/portal-close-gnome-xsession-37.png differ diff --git a/tests/references/portal-open-gnome-wayland-nested-37.png b/tests/references/portal-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..af490af Binary files /dev/null and b/tests/references/portal-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/portal-open-gnome-xsession-37.png b/tests/references/portal-open-gnome-xsession-37.png new file mode 100644 index 0000000..cb76843 Binary files /dev/null and b/tests/references/portal-open-gnome-xsession-37.png differ diff --git a/tests/references/preferences-gnome-wayland-nested-37.png b/tests/references/preferences-gnome-wayland-nested-37.png new file mode 100644 index 0000000..93e98e3 Binary files /dev/null and b/tests/references/preferences-gnome-wayland-nested-37.png differ diff --git a/tests/references/preferences-gnome-xsession-37.png b/tests/references/preferences-gnome-xsession-37.png new file mode 100644 index 0000000..aae55cc Binary files /dev/null and b/tests/references/preferences-gnome-xsession-37.png differ diff --git a/tests/references/snap-close-gnome-wayland-nested-37.png b/tests/references/snap-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..df81309 Binary files /dev/null and b/tests/references/snap-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/snap-close-gnome-xsession-37.png b/tests/references/snap-close-gnome-xsession-37.png new file mode 100644 index 0000000..4a38178 Binary files /dev/null and b/tests/references/snap-close-gnome-xsession-37.png differ diff --git a/tests/references/snap-open-gnome-wayland-nested-37.png b/tests/references/snap-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..991a060 Binary files /dev/null and b/tests/references/snap-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/snap-open-gnome-xsession-37.png b/tests/references/snap-open-gnome-xsession-37.png new file mode 100644 index 0000000..2325c5f Binary files /dev/null and b/tests/references/snap-open-gnome-xsession-37.png differ diff --git a/tests/references/trex-close-gnome-wayland-nested-37.png b/tests/references/trex-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..2673442 Binary files /dev/null and b/tests/references/trex-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/trex-close-gnome-xsession-37.png b/tests/references/trex-close-gnome-xsession-37.png new file mode 100644 index 0000000..a106d72 Binary files /dev/null and b/tests/references/trex-close-gnome-xsession-37.png differ diff --git a/tests/references/trex-open-gnome-wayland-nested-37.png b/tests/references/trex-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..ff4c3f7 Binary files /dev/null and b/tests/references/trex-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/trex-open-gnome-xsession-37.png b/tests/references/trex-open-gnome-xsession-37.png new file mode 100644 index 0000000..c8a732d Binary files /dev/null and b/tests/references/trex-open-gnome-xsession-37.png differ diff --git a/tests/references/tv-close-gnome-wayland-nested-37.png b/tests/references/tv-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..78cd2b7 Binary files /dev/null and b/tests/references/tv-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/tv-close-gnome-xsession-37.png b/tests/references/tv-close-gnome-xsession-37.png new file mode 100644 index 0000000..1760529 Binary files /dev/null and b/tests/references/tv-close-gnome-xsession-37.png differ diff --git a/tests/references/tv-open-gnome-wayland-nested-37.png b/tests/references/tv-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..a996a16 Binary files /dev/null and b/tests/references/tv-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/tv-open-gnome-xsession-37.png b/tests/references/tv-open-gnome-xsession-37.png new file mode 100644 index 0000000..d087796 Binary files /dev/null and b/tests/references/tv-open-gnome-xsession-37.png differ diff --git a/tests/references/wisps-close-gnome-wayland-nested-37.png b/tests/references/wisps-close-gnome-wayland-nested-37.png new file mode 100644 index 0000000..72a9948 Binary files /dev/null and b/tests/references/wisps-close-gnome-wayland-nested-37.png differ diff --git a/tests/references/wisps-close-gnome-xsession-37.png b/tests/references/wisps-close-gnome-xsession-37.png new file mode 100644 index 0000000..b6a6491 Binary files /dev/null and b/tests/references/wisps-close-gnome-xsession-37.png differ diff --git a/tests/references/wisps-open-gnome-wayland-nested-37.png b/tests/references/wisps-open-gnome-wayland-nested-37.png new file mode 100644 index 0000000..4b1a79e Binary files /dev/null and b/tests/references/wisps-open-gnome-wayland-nested-37.png differ diff --git a/tests/references/wisps-open-gnome-xsession-37.png b/tests/references/wisps-open-gnome-xsession-37.png new file mode 100644 index 0000000..e18d73c Binary files /dev/null and b/tests/references/wisps-open-gnome-xsession-37.png differ diff --git a/tests/run-test.sh b/tests/run-test.sh index adffae4..177ea53 100755 --- a/tests/run-test.sh +++ b/tests/run-test.sh @@ -28,6 +28,8 @@ # -v 33: GNOME Shell 3.38 # -v 34: GNOME Shell 40 # -v 35: GNOME Shell 41 +# -v 36: GNOME Shell 42 +# -v 37: GNOME Shell 43 # -s session: This can either be "gnome-xsession" or "gnome-wayland-nested". # Exit on error. @@ -154,16 +156,10 @@ do_in_pod wait-user-bus.sh > /dev/null 2>&1 # ----------------------------------------------------- install the to-be-tested extension echo "Installing extension." -podman cp "tests/references" "${POD}:/home/gnomeshell/references" podman cp "${EXTENSION}.zip" "${POD}:/home/gnomeshell" do_in_pod gnome-extensions install "${EXTENSION}.zip" -# ----------------------- install gnome-terminal (this is used for testing the animations) - -do_in_pod sudo dnf install -y gnome-terminal - - # ---------------------------------------------------------------------- start GNOME Shell # Starting with GNOME 40, there is a "Welcome Tour" dialog popping up at first launch.