diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | scripts/check-system | 8 | ||||
| -rw-r--r-- | scripts/system.modules | 17 | ||||
| -rw-r--r-- | tests/shell.py | 2 |
4 files changed, 30 insertions, 1 deletions
@@ -76,5 +76,9 @@ clean: rm -rf source/sugar-fructose rm -rf source/at-spi2-core rm -rf source/at-spi2-atk + rm -rf source/gstreamer + rm -rf source/gst-plugins-base + rm -rf source/gst-plugins-good rm -f logs/*.log logs/all-logs.tar.bz2 rm -f scripts/list-outputs + rm -f scripts/find-free-display diff --git a/scripts/check-system b/scripts/check-system index 0d35478..6dcad8e 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -255,9 +255,17 @@ checks = \ "checker": "gstreamer", "packages": { "fedora": "gstreamer-plugins-good", "ubuntu": "gstreamer0.10-plugins-good" } }, + { "check": "import abiword", + "checker": "python", + "packages": { "fedora": "pyabiword", + "ubuntu": None } }, # System modules buildtime + { "check": "c++", + "checker": "binary", + "packages": { "fedora": "gcc-c++", + "ubuntu": "g++" } }, { "check": "flex", "checker": "binary", "packages": { "fedora": "flex", diff --git a/scripts/system.modules b/scripts/system.modules index b350f28..eea3521 100644 --- a/scripts/system.modules +++ b/scripts/system.modules @@ -3,6 +3,7 @@ <moduleset> <repository type="git" name="git.gnome.org" href="git://git.gnome.org"/> <repository type="git" name="github.com/dnarvaez" href="git://github.com/dnarvaez"/> + <repository type="git" name="gstreamer.freedesktop.org" href="git://anongit.freedesktop.org/gstreamer/"/> <autotools id="gtk+"> <branch repo="git.gnome.org"/> <dependencies> @@ -42,11 +43,27 @@ <autotools id="glib"> <branch repo="git.gnome.org" revision="3e706ef88b3b433f777e552c85339b901314deaa"/> </autotools> + <autotools id="gstreamer" revision="8d9a4b2e94fa806f5146482fb0261d890db38fd5" supports-non-srcdir-builds="no"> + <branch repo="gstreamer.freedesktop.org"/> + </autotools> + <autotools id="gst-plugins-base" revision="39aa4dc674291f438606ccab6033225f7a886de4" supports-non-srcdir-builds="no"> + <branch repo="gstreamer.freedesktop.org"/> + <dependencies> + <dep package="gstreamer"/> + </dependencies> + </autotools> + <autotools id="gst-plugins-good" revision="86c236a5f61725dc4e0fe22ba6681795bb5f1160" supports-non-srcdir-builds="no"> + <branch repo="gstreamer.freedesktop.org"/> + <dependencies> + <dep package="gst-plugins-base"/> + </dependencies> + </autotools> <metamodule id="meta-system"> <dependencies> <dep package="pygobject"/> <dep package="gtk+"/> + <dep package="gst-plugins-good"/> </dependencies> </metamodule> </moduleset> diff --git a/tests/shell.py b/tests/shell.py index d606783..ff5a13e 100644 --- a/tests/shell.py +++ b/tests/shell.py @@ -6,7 +6,7 @@ from dogtail import predicate from dogtail import dump ACTIVITIES_WITH_OBJECT_CHOOSER = ["Read", "Image Viewer", "Jukebox"] -ACTIVITIES_TO_IGNORE = ["Pippy", "Write"] +ACTIVITIES_TO_IGNORE = ["Pippy"] def build_activities_list(): shell = tree.root.child(name="sugar-session", roleName="application") |