From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebKitTools/BuildSlaveSupport/gtk/xvfb/run | 41 ------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100755 WebKitTools/BuildSlaveSupport/gtk/xvfb/run

(limited to 'WebKitTools/BuildSlaveSupport/gtk/xvfb/run')

diff --git a/WebKitTools/BuildSlaveSupport/gtk/xvfb/run b/WebKitTools/BuildSlaveSupport/gtk/xvfb/run
deleted file mode 100755
index 89cd301..0000000
--- a/WebKitTools/BuildSlaveSupport/gtk/xvfb/run
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/bash
-#
-# Copyright (C) 2010 Igalia S.L. All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this library; see the file COPYING.LIB.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-exec 2>&1
-
-: ${BUILDBOT_CONFIG:=/etc/daemontools-buildbot.conf}
-
-# Read configuration file
-[ -r "${BUILDBOT_CONFIG}" ] && . "${BUILDBOT_CONFIG}"
-
-: ${xvfb_display:=':10'}
-: ${xvfb_mode:='1024x768x24'}
-
-# Expand all "env_*" environment variables
-for varname in ${!env_*} ; do
-	eval "export ${varname#env_}=\${${varname}}"
-done
-
-mkdir -p "xvfb${xvfb_display}"
-exec /usr/bin/Xvfb "${xvfb_display}" \
-	-fbdir "xvfb${xvfb_display}" \
-	-screen 0 "${xvfb_mode}" \
-	-nolisten inet6 \
-	-nolisten inet
-
-- 
cgit v1.1