mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1223123 - Enable pulse_audio for Linux64 TC desktop jobs + proper window manager. r=dustin
This commit is contained in:
parent
222dabbef9
commit
b285892070
@ -98,6 +98,9 @@ GPATH
|
||||
^testing/mozharness/logs/
|
||||
^testing/mozharness/build/
|
||||
|
||||
# Ignore tox generated dir
|
||||
.tox/
|
||||
|
||||
# Ignore node_modules from eslint-plugin-mozilla
|
||||
^testing/eslint-plugin-mozilla/node_modules/
|
||||
|
||||
|
@ -96,8 +96,8 @@ Each image also has a `REGISTRY`, defaulting to the `REGISTRY` in this directory
|
||||
|
||||
## Building images
|
||||
|
||||
Generally images can be pulled from the [registry](./REGISTRY) rather then
|
||||
build locally, but for developing new images its often helpful to hack on
|
||||
Generally, images can be pulled from the [registry](./REGISTRY) rather than
|
||||
built locally, however, for developing new images it's often helpful to hack on
|
||||
them locally.
|
||||
|
||||
To build an image, invoke `build.sh` with the name of the folder (without a trailing slash):
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM taskcluster/ubuntu1204-test-upd:0.1.2.20151102105912
|
||||
FROM taskcluster/ubuntu1204-test-upd:0.1.3.20151125000000
|
||||
MAINTAINER Jonas Finnemann Jensen <jopsen@gmail.com>
|
||||
|
||||
# Add utilities and configuration
|
||||
|
@ -1 +1 @@
|
||||
0.4.4
|
||||
0.4.5
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM taskcluster/ubuntu1204-test:0.1.2
|
||||
FROM taskcluster/ubuntu1204-test:0.1.3
|
||||
MAINTAINER Dustin J. Mitchell <dustin@mozilla.com>
|
||||
|
||||
### update to latest from upstream repositories
|
||||
|
@ -1 +1 @@
|
||||
0.1.2.20151102105912
|
||||
0.1.3.20151125000000
|
||||
|
@ -1 +1 @@
|
||||
0.1.2
|
||||
0.1.3
|
||||
|
@ -104,6 +104,7 @@ apt_packages+=('ttf-oriya-fonts')
|
||||
apt_packages+=('ttf-paktype')
|
||||
apt_packages+=('ttf-punjabi-fonts')
|
||||
apt_packages+=('ttf-sazanami-mincho')
|
||||
apt_packages+=('ubuntu-desktop')
|
||||
apt_packages+=('unzip')
|
||||
apt_packages+=('uuid')
|
||||
apt_packages+=('vim')
|
||||
@ -123,6 +124,8 @@ apt_packages+=('python-dev')
|
||||
apt_packages+=('python-pip')
|
||||
|
||||
apt-get update
|
||||
# This allows ubuntu-desktop to be installed without human interaction
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get install -y --force-yes ${apt_packages[@]}
|
||||
|
||||
dpkg-reconfigure locales
|
||||
|
@ -14,6 +14,7 @@ echo "running as" $(id)
|
||||
: MOZHARNESS_SCRIPT ${MOZHARNESS_SCRIPT}
|
||||
: MOZHARNESS_CONFIG ${MOZHARNESS_CONFIG}
|
||||
: NEED_XVFB ${NEED_XVFB:=true}
|
||||
: NEED_WINDOW_MANAGER ${NEED_WINDOW_MANAGER:=false}
|
||||
: NEED_PULSEAUDIO ${NEED_PULSEAUDIO:=false}
|
||||
: WORKSPACE ${WORKSPACE:=/home/worker/workspace}
|
||||
: mozharness args "${@}"
|
||||
@ -75,6 +76,30 @@ if $NEED_XVFB; then
|
||||
if [ $xvfb_test == 255 ]; then exit 255; fi
|
||||
fi
|
||||
|
||||
if $NEED_WINDOW_MANAGER; then
|
||||
# start up the gnome session, using a semaphore file to know when the session has fully started
|
||||
# (at least to the point where apps are automatically started)
|
||||
semaphore=/tmp/gnome-session-started
|
||||
rm -f $semaphore
|
||||
mkdir -p ~/.config/autostart
|
||||
cat <<EOF > ~/.config/autostart/gnome-started.desktop
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Exec=touch $semaphore
|
||||
Hidden=false
|
||||
X-GNOME-Autostart-enabled=true
|
||||
Name=Startup Complete
|
||||
Comment=Notify test-linux.sh that GNOME session startup is complete
|
||||
StartupNotify=false
|
||||
Terminal=false
|
||||
Type=Application
|
||||
EOF
|
||||
gnome-session &
|
||||
while [ ! -f $semaphore ]; do
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
|
||||
# support multiple, space delimited, config files
|
||||
config_cmds=""
|
||||
for cfg in $MOZHARNESS_CONFIG; do
|
||||
|
@ -15,6 +15,8 @@ task:
|
||||
- --total-chunk={{total_chunks}}
|
||||
- --this-chunk={{chunk}}
|
||||
env:
|
||||
NEED_WINDOW_MANAGER: true
|
||||
NEED_PULSEAUDIO: true
|
||||
GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
|
||||
GECKO_HEAD_REV: '{{{head_rev}}}'
|
||||
MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
|
||||
|
Loading…
Reference in New Issue
Block a user