[eclipse-testframework] Update library.xml patch for 3.7

[Andrew Overholt]

commit 410db9b8a3917ca1a5540cf6733ca74f6b96e6ba
Author: Andrew Overholt <overholt at redhat.com>
Date:   Wed Jul 6 11:13:45 2011 -0400

    Update library.xml patch for 3.7

 eclipse-testframework-libraryXml.patch |  107 ++++++++++++++++++++++
 eclipse-tests-libraryXml.patch         |  157 --------------------------------
 2 files changed, 107 insertions(+), 157 deletions(-)
---
diff --git a/eclipse-testframework-libraryXml.patch b/eclipse-testframework-libraryXml.patch
new file mode 100644
index 0000000..1ff7f19
--- /dev/null
+++ b/eclipse-testframework-libraryXml.patch
@@ -0,0 +1,107 @@
+--- org.eclipse.test/library.xml.orig	2011-07-06 10:14:50.720539669 -0400
++++ org.eclipse.test/library.xml	2011-07-06 10:26:32.711562970 -0400
+@@ -38,22 +38,22 @@
+ 		<condition property="vmargs" value=" -Xms256M -Xmx512M -XX:MaxPermSize=500m">
+ 			<equals arg1="${test.target}" arg2="performance" />
+ 		</condition>
++		<condition property="extraVMargs" value=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=40000">
++		                    <equals arg1="${debugTests}" arg2="true" />
++		</condition>
+ 		<tstamp prefix="NOW" />
+ 		<property name="coverage-output" value="${eclipse-home}/coverage" />
+ 		<property file="${basedir}/finalPluginsVersions.properties" />
+ 		<echo message="basedir = ${basedir}" />
+-		<condition property="extraVMargs" value="-javaagent:${basedir}/plugins/org.eclipse.test_${org.eclipse.test}/lib/jacocoagent.jar=destfile=${coverage-output}/jacoco${classname}${NOW.DSTAMP}_${NOW.TSTAMP}.exec">
+-			<not>
+-				<equals arg1="${test.target}" arg2="performance" />
+-			</not>
+-		</condition>
+ 		<property name="extraVMargs" value="" />
+ 		<property name="plugin-path" value="" />
++		<property name="tmpresults" value="${eclipse-home}/tmpresults/" />
++		<property name="testhome" value="${eclipse-home}/testhome" />
+ 		<property name="timeout" value="7200000" />
+-		<property name="test-output" value="${eclipse-home}/${classname}.xml" />
++		<property name="test-output" value="${tmpresults}/${classname}.xml" />
+ 		<property name="junit-report-output" value="${eclipse-home}/results" />
+ 		<mkdir dir="${junit-report-output}" />
+-		<property name="junit-stylesheet" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL" />
++		<property name="junit-stylesheet" value="${eclipse-home}/dropins/testframework/eclipse/plugins/org.eclipse.test_*/JUNIT.XSL" />
+ 	</target>
+ 
+ 	<target name="core-test" description="Eclipse application used to launch HEADLESS plugin tests." depends="init">
+@@ -73,7 +73,11 @@
+ 		<condition property="vmargs" value=" -Xms40m -Xmx384m -XX:MaxPermSize=256m">
+ 			<os family="windows" />
+ 		</condition>
+-		<property name="vmargs" value=" -Xms40m -Xmx384m -XX:MaxPermSize=256m" />
++		<property name="vmargs" value=" -Xms40m -Xmx384m -XX:MaxPermSize=512m" />
++		<delete failonerror="false" includeEmptyDirs="true">
++		  <fileset dir="${testhome}" includes="**/*"/>
++		</delete>
++		<mkdir dir="${testhome}"/>
+ 
+ 		<!--set default jvm to use for testing-->
+ 		<property name="jvm" value="${java.home}/bin/java" />
+@@ -87,7 +91,7 @@
+ 				</fileset>
+ 			</classpath>
+ 			<arg line="-application ${application}" />
+-			<arg line="-data ${data-dir}" />
++			<arg line="-data ${test-data-dir}" />
+ 			<arg line="formatter=${formatter},${test-output}" />
+ 			<arg line="-testPluginName ${plugin-name}" />
+ 			<arg line="-className ${classname}" />
+@@ -95,9 +99,20 @@
+ 			<arg line="-ws ${ws}" />
+ 			<arg line="-arch ${arch}" />
+ 			<arg line="-consolelog" />
++			<arg line="-clean"/>
++			<arg line="-Dswt.library.path=/usr/lib/eclipse"/>
++			<arg line="-Dsetup.override.vmArgs=Xms256m;Xmx1024m"/>
++			<arg line="-Dsetup.override.systemProperties=PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>			
+ 			<arg line="-timeout ${timeout}" />
+ 			<jvmarg line="${vmargs} ${extraVMargs}" />
+ 			<sysproperty key="PLUGIN_PATH" value="${plugin-path}" />
++			<sysproperty key="user.home" value="${testhome}"/>
++			<sysproperty key="swt.library.path" value="/usr/lib/eclipse"/>
++			<sysproperty key="setup.override.vmArgs" value="Xms256m;Xmx1024m"/>
++			<sysproperty key="setup.override.systemProperties" value="PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>
++			<sysproperty key="sdk.tests.data.dir" value="${data-dir}"/>
++			<sysproperty key="org.eclipse.equinox.p2.reconciler.tests.platform.archive" value="${tmpresults}/eclipse-platform-archive.tar.gz"/>
++			<sysproperty key="osgi.configuration.area" value="${data-dir}"/>
+ 		</java>
+ 		<antcall target="collect-results" />
+ 	</target>
+@@ -105,6 +120,11 @@
+ 	<target name="eclipse-test" description="Runs the specified classname as a plug-in test.">
+ 		<property name="vmargs" value="-Xms256m -Xmx512m -XX:MaxPermSize=256m" />
+ 
++		<delete failonerror="false" includeEmptyDirs="true">
++		  <fileset dir="${testhome}" includes="**/*"/>
++		</delete>
++		<mkdir dir="${testhome}"/>
++		
+ 		<!--use -consolelog if launching a headless test-->
+ 		<condition property="consolelog" value="-consolelog">
+ 			<equals arg1="${application}" arg2="org.eclipse.test.coretestapplication" />
+@@ -138,6 +158,8 @@
+ 			<arg line="--launcher.suppressErrors" />
+ 			<arg line="${consolelog}" />
+ 			<arg line="-vmargs ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}" />
++			<arg line="-Duser.home=${testhome}"/>
++			<arg line="-Dsetup.override.systemProperties=PLUGIN_PATH=${plugin-path};user.home=${testhome}"/>
+ 		</exec>
+ 		<antcall target="collect-results" />
+ 	</target>
+@@ -168,8 +190,8 @@
+ 			includes		- the names of the files to include
+ 			output-file		- the name of the output file to produce
+ 		-->
+-		<junitreport todir="." tofile="${output-file}">
+-			<fileset dir=".">
++		<junitreport todir="${results}" tofile="${output-file}">
++			<fileset dir="${tmpresults}">
+ 				<include name="${includes}" />
+ 			</fileset>
+ 		</junitreport>