diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 02:05:43 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 02:05:43 +0000 |
| commit | 0bd77e0362777012ef9aa1c2497cd09328f8cdde (patch) | |
| tree | e7bf640729b2407be30bbe6830d050dd4b18a039 /tools/wine_valgrind | |
| parent | 33b3eb99aa021b71150b913de0da5680ce68f43c (diff) | |
| download | chromium_src-0bd77e0362777012ef9aa1c2497cd09328f8cdde.zip chromium_src-0bd77e0362777012ef9aa1c2497cd09328f8cdde.tar.gz chromium_src-0bd77e0362777012ef9aa1c2497cd09328f8cdde.tar.bz2 | |
wine_valgrind: Clean up X lock files if vnc got killed with SIGKILL.
BUG=none
TEST=Bot master restart does not break wine_valgrind bot.
Review URL: http://codereview.chromium.org/525052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/wine_valgrind')
| -rwxr-xr-x | tools/wine_valgrind/chrome_tests.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/wine_valgrind/chrome_tests.sh b/tools/wine_valgrind/chrome_tests.sh index 163f05d..ed90c82 100755 --- a/tools/wine_valgrind/chrome_tests.sh +++ b/tools/wine_valgrind/chrome_tests.sh @@ -252,6 +252,9 @@ init_runtime() { then export DISPLAY=":$VNC" vncserver -kill "$DISPLAY" || true + # VNC servers don't clean these up if they get a SIGKILL, and would then + # refuse to start because these files are there. + rm -f "/tmp/.X${VNC}-lock" "/tmp/.X11-unix/X${VNC}" vncserver "$DISPLAY" -ac -depth 24 -geometry 1024x768 fi $dry_run rm -rf $WINEPREFIX |