client/deps/factory/startx.sh - Issue 2857012: Batched update of factory tests.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: client/deps/factory/startx.sh

Issue 2857012: Batched update of factory tests. (Closed) Base URL: ssh://gitrw.chromium.org/autotest.git

Patch Set: finished comment Created 10 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #!/bin/sh	1 #!/bin/sh

2	2

3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

4 # Use of this source code is governed by a BSD-style license that can be	4 # Use of this source code is governed by a BSD-style license that can be

5 # found in the LICENSE file.	5 # found in the LICENSE file.

6	6

7 XAUTH=/usr/bin/xauth	7 XAUTH=/usr/bin/xauth

	8 XAUTH_FILE="/var/run/factory_ui.auth"

8 SERVER_READY=	9 SERVER_READY=

9	10 DISPLAY=":0"

10 export XAUTH_FILE="/var/run/factory_test.auth"

11	11

12 user1_handler () {	12 user1_handler () {

13 echo "X server ready..."	13 echo "X server ready..." 1>&2

14 SERVER_READY=y	14 SERVER_READY=y

15 }	15 }

16	16

17 trap user1_handler USR1	17 trap user1_handler USR1

18 MCOOKIE=$(head -c 8 /dev/urandom \| openssl md5)	18 MCOOKIE=$(head -c 8 /dev/urandom \| openssl md5)

19 ${XAUTH} -q -f ${XAUTH_FILE} add :0 . ${MCOOKIE}	19 ${XAUTH} -q -f ${XAUTH_FILE} add ${DISPLAY} . ${MCOOKIE}

20	20

21 /sbin/xstart.sh ${XAUTH_FILE} &	21 /sbin/xstart.sh ${XAUTH_FILE} &

22	22

23 while [ -z ${SERVER_READY} ]; do	23 while [ -z ${SERVER_READY} ]; do

24 sleep .1	24 sleep .1

25 done	25 done

26	26

27 export SHELL=/bin/bash	27 /sbin/initctl emit factory-ui-started

28 export DISPLAY=:0.0	28 cat /proc/uptime > /tmp/uptime-x-started

29 export PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11

30 export XAUTHORITY=${XAUTH_FILE}

31	29

32 /usr/bin/python TouchpadTest.py $*	30 echo "DISPLAY=${DISPLAY}; export DISPLAY"

33 STATUS=$?	31 echo "XAUTHORITY=${XAUTH_FILE}; export XAUTHORITY"

34

35 /usr/bin/pkill X

36 exit $STATUS

OLD	NEW

« no previous file with comments | « client/common_lib/factory_test.py ('k') | client/deps/factory/ui » ('j') | no next file with comments »