rpms/eclipse-testframework/devel sources, 1.2, 1.3 eclipse-tests-libraryXml.patch, 1.1, 1.2 eclipse-testframework.spec, 1.2, 1.3 .cvsignore, 1.2, 1.3

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-testframework/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18845/devel

Modified Files:
	sources eclipse-tests-libraryXml.patch 
	eclipse-testframework.spec .cvsignore 
Log Message:
Update to 3.6.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Aug 2009 18:41:25 -0000	1.2
+++ sources	14 Jul 2010 15:01:12 -0000	1.3
@@ -1 +1 @@
-6ef74438dfeb4919be5bef810bf93e2d  eclipse-testframework-fetched-src-R3_5.tar.bz2
+abd668b54c4bf20b1e629a9e764c219b  eclipse-testframework-fetched-src-R3_6.tar.bz2

eclipse-tests-libraryXml.patch:
 library.xml |   63 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 18 deletions(-)

Index: eclipse-tests-libraryXml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/eclipse-tests-libraryXml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-tests-libraryXml.patch	31 Aug 2009 08:58:14 -0000	1.1
+++ eclipse-tests-libraryXml.patch	14 Jul 2010 15:01:12 -0000	1.2
@@ -1,12 +1,5 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.test
-Index: library.xml
-===================================================================
-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	7 May 2009 18:49:56 -0000
+--- org.eclipse.test/library.xml.orig	2009-10-01 18:06:41.000000000 +0300
++++ org.eclipse.test/library.xml	2010-07-14 17:49:04.722008894 +0300
 @@ -6,13 +6,13 @@
  	</target>
  
@@ -32,19 +25,13 @@ diff -u -r1.33 library.xml
  	  	<tstamp>
  	        <format property="TIMENOW" pattern="HHmmssSSSS"/>
  	    </tstamp>
-@@ -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"/>
--	    
-+
- 		<!--default heap sizes when running performance tests-->
- 	    <condition property="vmargs" value=" -Xms256M -Xmx256M">
+@@ -38,10 +38,15 @@
+ 	    <condition property="vmargs" value=" -Xms256M -Xmx512M">
  			<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>
++		<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/" />
@@ -55,41 +42,19 @@ diff -u -r1.33 library.xml
  		<property name="junit-report-output" value="${eclipse-home}/results" />
  		<mkdir dir="${junit-report-output}"/>
  	</target>
--	
-+
- 	<target name="core-test" description="Eclipse application used to launch HEADLESS plugin tests." depends="init">
- 		<antcall target="${launchTarget}">
- 			<param name="application" value="org.eclipse.test.coretestapplication"/>
- 		</antcall>
- 	</target>
--	
-+
- 	<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 +65,17 @@
+@@ -60,7 +65,11 @@
  
  	<target name="java-test">
  		<!--default vm args-->
--		<property name="vmargs" value=" -Xms40m -Xmx256m"/>
--	  	
+-		<property name="vmargs" value=" -Xms40m -Xmx348m"/>
 +		<property name="vmargs" value=" -Xms256m -Xmx1024m -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" />  	
--	
-+	   	<property name="jvm" value="${java.home}/bin/java" />
-+
- 		<echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
--		
-+
- 		<java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
- 			classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
- 	        <classpath>
+ 	   	<property name="jvm" value="${java.home}/bin/java" />  	
 @@ -75,7 +84,7 @@
  	          	</fileset>
  	        </classpath>
@@ -168,8 +133,8 @@ diff -u -r1.33 library.xml
  			</fileset>
  		</junitreport>
  
--		<style style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
-+		<style style="${eclipse-home}/dropins/sdk/plugins/org.eclipse.test/JUNIT.XSL"
+-		<xslt style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
++		<xslt style="${eclipse-home}/dropins/sdk/plugins/org.eclipse.test/JUNIT.XSL"
  			basedir="${junit-report-output}"
  			includes="${classname}.result.xml"
  			destdir="${junit-report-output}" />


Index: eclipse-testframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/eclipse-testframework.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-testframework.spec	31 Aug 2009 08:58:14 -0000	1.2
+++ eclipse-testframework.spec	14 Jul 2010 15:01:12 -0000	1.3
@@ -1,10 +1,10 @@
 %global eclipse_base   %{_libdir}/eclipse
 %global install_loc    %{_datadir}/eclipse/dropins/testframework
-%global tag            R3_5
+%global tag            R3_6
 
 Name:           eclipse-testframework
-Version:        3.5.0
-Release:        3%{?dist}
+Version:        3.6.0
+Release:        1%{?dist}
 Summary:        Eclipse Test Framework
 
 Group:          Development/Tools
@@ -35,9 +35,7 @@ Eclipse Test Framework. Used in conjunct
 %setup -q -n %{name}-fetched-src-%{tag}
 chmod -x org.eclipse.test-feature/*.html
 %patch0
-pushd org.eclipse.test
 %patch1
-popd
 sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
 
 mkdir orbitDeps
@@ -71,6 +69,9 @@ popd
 %doc org.eclipse.test-feature/epl-v10.html
 
 %changelog
+* Wed Jul 14 2010 Alexander Kurtakov <akurtako at redhat.com> 3.6.0-1
+- Update to 3.6.
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-3
 - Move library.xml patch from eclipse srpm.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-testframework/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Aug 2009 18:41:24 -0000	1.2
+++ .cvsignore	14 Jul 2010 15:01:12 -0000	1.3
@@ -1 +1 @@
-eclipse-testframework-fetched-src-R3_5.tar.bz2
+eclipse-testframework-fetched-src-R3_6.tar.bz2