From c2338e38835405f273920c781821d92049c51ca5 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: May 07 2009 19:07:51 +0000
Subject: - Update patch to tests' library.xml to allow for easy debugging of tests.


---

diff --git a/eclipse-tests-libraryXml.patch b/eclipse-tests-libraryXml.patch
index 63eea5c..515ffe0 100644
--- a/eclipse-tests-libraryXml.patch
+++ b/eclipse-tests-libraryXml.patch
@@ -6,7 +6,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.test/library.xml,v
 retrieving revision 1.33
 diff -u -r1.33 library.xml
 --- library.xml	13 Mar 2008 14:00:36 -0000	1.33
-+++ library.xml	5 Dec 2008 14:11:35 -0000
++++ library.xml	7 May 2009 18:49:56 -0000
 @@ -6,13 +6,13 @@
  	</target>
  
@@ -32,7 +32,7 @@ diff -u -r1.33 library.xml
  	  	<tstamp>
  	        <format property="TIMENOW" pattern="HHmmssSSSS"/>
  	    </tstamp>
-@@ -33,25 +33,27 @@
+@@ -33,25 +33,30 @@
  		<!--default launch target for launching tests-->
  		<property name="launchTarget" value="java-test" />
  		<property name="formatter" value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -42,6 +42,9 @@ diff -u -r1.33 library.xml
  	    <condition property="vmargs" value=" -Xms256M -Xmx256M">
  			<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>
  		<property name="extraVMargs" value=""/>
  		<property name="plugin-path" value="" />
 +		<property name="tmpresults" value="${eclipse-home}/tmpresults/" />
@@ -64,7 +67,7 @@ diff -u -r1.33 library.xml
  	<target name="ui-test" description="Eclipse application used to launch UI plugin tests." depends="init">
  		<antcall target="${launchTarget}">
  			<param name="application" value="org.eclipse.test.uitestapplication"/>
-@@ -60,13 +62,17 @@
+@@ -60,13 +65,17 @@
  
  	<target name="java-test">
  		<!--default vm args-->
@@ -87,7 +90,7 @@ diff -u -r1.33 library.xml
  		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
  			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
  	        <classpath>
-@@ -75,7 +81,7 @@
+@@ -75,7 +84,7 @@
  	          	</fileset>
  	        </classpath>
  		    <arg line="-application ${application}"/>
@@ -96,7 +99,7 @@ diff -u -r1.33 library.xml
  		    <arg line="formatter=${formatter},${test-output}"/>
  		    <arg line="-testPluginName ${plugin-name}"/>
  		    <arg line="-className ${classname}"/>
-@@ -83,15 +89,30 @@
+@@ -83,15 +92,31 @@
  		    <arg line="-ws ${ws}"/>
  		    <arg line="-arch ${arch}"/>
  		    <arg line="-consolelog"/>
@@ -112,6 +115,7 @@ diff -u -r1.33 library.xml
 +			<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" />
@@ -131,7 +135,7 @@ diff -u -r1.33 library.xml
  		<!--use -consolelog if launching a headless test-->
  		<condition property="consolelog" value="-consolelog">
  			<equals arg1="${application}" arg2="org.eclipse.test.coretestapplication"/>
-@@ -107,11 +128,11 @@
+@@ -107,11 +132,11 @@
  			<isset property="jvm" />
  		</condition>
  		<property name="test-vm" value="" />
@@ -146,7 +150,7 @@ diff -u -r1.33 library.xml
  		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
  
  		<exec executable="${eclipse-home}/eclipse" dir="${eclipse-home}" timeout="${timeout}" logError="true" failonerror="false" output="${junit-report-output}/${classname}.txt">
-@@ -125,10 +146,12 @@
+@@ -125,10 +150,12 @@
  			<arg line="--launcher.suppressErrors"/>
  			<arg line="${consolelog}"/>
  			<arg line="-vmargs ${vmargs} ${extraVMargs} -DPLUGIN_PATH=${plugin-path}"/>
@@ -160,7 +164,7 @@ diff -u -r1.33 library.xml
  	<target name="collect-results">
  		<dirname property="output-dir" file="${test-output}"/>
  		<basename property="output-file-name" file="${test-output}"/>
-@@ -138,7 +161,7 @@
+@@ -138,7 +165,7 @@
  			</fileset>
  		</junitreport>
  
@@ -169,7 +173,7 @@ diff -u -r1.33 library.xml
  			basedir="${junit-report-output}"
  			includes="${classname}.result.xml"
  			destdir="${junit-report-output}" />
-@@ -153,13 +176,13 @@
+@@ -153,13 +180,13 @@
  	<target name="collect">
  		<!--
  			This target can be used to aggragate test runs from multiple test suites into a single report.
diff --git a/eclipse.spec b/eclipse.spec
index a684362..36574c6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.6%{?dist}
+Release:        0.2.7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1591,6 +1591,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu May 7 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.0-0.2.7
+- Update patch to tests' library.xml to allow for easy debugging of tests. 
+
 * Wed Apr 29 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.2.6
 - Fix initializer run (sed again).