From 87e8d0b7755068a1900859e5fd10cb3f4912b2c2 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 28 Aug 2018 17:21:04 +0300 Subject: [PATCH] Fix the test-suite --- .gitlab-ci.yml | 3 +++ scripts/test.sh | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45a9210..a707387 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,9 @@ flatpak: - | xvfb-run -a -s "-screen 0 1024x768x24" \ flatpak-builder --run \ + --env=APP_ID="org.gnome.PodcastsDevel" \ + --env=LOCALEDIR="./podcasts-gtk/po" \ + --env=VERSION="0.0.0" \ --env=RUSTFLAGS="--cfg rayon_unstable" \ --env=CARGO_HOME="target/cargo-home" \ --env=CARGO_TARGET_DIR="target_test/" \ diff --git a/scripts/test.sh b/scripts/test.sh index c3a8bb2..6372647 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,10 +1,10 @@ #! /usr/bin/sh -export MANIFEST_PATH="org.gnome.Podcasts.json" +export MANIFEST_PATH="org.gnome.PodcastsDevel.json" export RUNTIME_REPO="https://sdk.gnome.org/gnome-nightly.flatpakrepo" export FLATPAK_MODULE="gnome-podcasts" export CONFIGURE_ARGS="" -export DBUS_ID="org.gnome.Podcasts" +export DBUS_ID="org.gnome.PodcastsDevel" export BUNDLE="org.gnome.Podcasts.Devel.flatpak" flatpak-builder --stop-at=${FLATPAK_MODULE} --keep-build-dirs --force-clean app ${MANIFEST_PATH} @@ -23,6 +23,9 @@ flatpak-builder --run \ # Run the tests xvfb-run -a -s "-screen 0 1024x768x24" \ flatpak-builder --run \ + --env=APP_ID="org.gnome.PodcastsDevel" \ + --env=LOCALEDIR="./podcasts-gtk/po" \ + --env=VERSION="0.0.0" \ --env=RUSTFLAGS="--cfg rayon_unstable" \ --env=CARGO_HOME="target/cargo-home" \ --env=CARGO_TARGET_DIR="target_test/" \