Remove xvfb

Change-Id: I335b494f60d030ad42f48c6fff20ec03321d7fa4
Reviewed-on: http://gerrit.dmdirc.com/1677
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

build-tests.xml

@@ -5,7 +5,6 @@
     <property name="clover.jar" location="lib/clover.jar"/>
     <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
     <taskdef resource="cloverjunitlib.xml" classpath="${clover.jar}"/>
-    <available file="/usr/bin/xvfb-run" property="has.xvfb"/>
 
     <condition property="clover.installed">
      <and>
@@ -82,41 +81,6 @@
         </junitreport>
     </target>
 
-    <target name="test" depends="check-use-xvfb, -test-xvfb, -test-no-xvfb"/>
-
-    <target name="check-use-xvfb">
-        <condition property="use.xvfb">
-            <and>
-                <not>
-                    <equals arg1="${xvfb.disable}" arg2="true" />
-                </not>
-                <equals arg1="${has.xvfb}" arg2="true" />
-            </and>
-        </condition>
-    </target>
-
-    <target name="-test-xvfb" if="use.xvfb">
-        <exec executable="/usr/bin/xvfb-run">
-            <arg value="-a"/>
-            <arg value="-s"/>
-            <arg value="-screen 0 1280x1024x24"/>
-            <arg value="-w"/>
-            <arg value="5"/>
-            <arg value="/usr/bin/ant"/>
-            <arg value="do-xvfb-tests"/>
-        </exec>
-    </target>
-
-    <target name="do-xvfb-tests" depends="with.clover,do-real-test,clover.snapshot"/>
-
-    <target name="-test-no-xvfb" unless="use.xvfb">
-        <antcall>
-            <target name="with.clover"/>
-            <target name="do-real-test"/>
-            <target name="clover.snapshot"/>
-        </antcall>
-    </target>
-
     <target name="test-html" depends="with.clover,compile-test,test,clover.html,clover.snapshot"
             description="Run tests and generate a Clover HTML report."/>
     <target name="test-xml" depends="with.clover,compile-test,test,clover.xml,clover.snapshot"

nbproject/build-impl.xml

@@ -688,7 +688,7 @@ is divided into following sections:
     </target>
     <target depends="init" if="have.tests" name="test-report"/>
     <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="do-real-test"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
     <target depends="init" if="have.tests" name="-pre-test-run-single">
         <mkdir dir="${build.test.results.dir}"/>
     </target>