Commit ae7a9c9f authored by Michael Terry's avatar Michael Terry

Some minor fixes; rename screenshot filenames

parent 80a41244
Pipeline #50107 passed with stage
in 9 minutes and 32 seconds
......@@ -52,12 +52,13 @@ screenshots: all
@mkdir -p ./builddir/screenshots
@rm -f ./builddir/screenshots/*
@./tests/shell-local "deja-dup" &
@gnome-screenshot --window --delay 1 --file ./builddir/screenshots/screenshot-1.png
@gnome-screenshot --window --delay 1 --file data/appdata/01-main.png
@killall deja-dup
@./tests/shell-local "deja-dup --backup" >/dev/null &
@gnome-screenshot --window --delay 1 --file ./builddir/screenshots/screenshot-2.png
@gnome-screenshot --window --delay 1 --file data/appdata/02-backup.png
@killall deja-dup
@gsettings reset org.gnome.desktop.interface font-name
......@@ -65,6 +66,8 @@ screenshots: all
@gsettings reset org.gnome.desktop.interface icon-theme
@gsettings reset org.gnome.desktop.wm.preferences theme
@gsettings reset org.gnome.DejaDup backend
@eog data/appdata
pot: configure
ninja -C builddir deja-dup-pot help-org.gnome.DejaDup-pot
......
......@@ -251,6 +251,7 @@ public class DejaDupApp : Gtk.Application
}
op.show_all();
op.present_with_time(Gtk.get_current_event_time());
Gdk.notify_startup_complete();
}
......
......@@ -36,6 +36,9 @@ SHNAME=$(basename $0)
ROOTDIR=$(mktemp -d --tmpdir dd.XXXXXXXXXX)
export DEJA_DUP_TEST_ROOT="${ROOTDIR}"
echo "$@" > "$ROOTDIR/runscript.sh"
cat "$ROOTDIR/runscript.sh"
run_shell()
{
ARGS=$@
......@@ -69,7 +72,7 @@ if [ "$SHNAME" = "shell" ]; then
export DEJA_DUP_TOOLS_PATH="${BUILDDIR}/libdeja/tools/duplicity"
export PATH="${BUILDDIR}/deja-dup/monitor:${BUILDDIR}/deja-dup:${PATH}"
run_shell $@
run_shell "sh $ROOTDIR/runscript.sh"
exit
fi
......@@ -119,4 +122,4 @@ else
export DEJA_DUP_TEST_SYSTEM=1
fi
run_shell $@
run_shell "sh $ROOTDIR/runscript.sh"
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