[eclipse-testframework/f17] Update to Juno release.
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Jul 10 10:56:45 UTC 2012
commit 9a7865d36a5aa6e081a1de3c81d99e86e68d8b43
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Jul 10 12:50:08 2012 +0200
Update to Juno release.
.gitignore | 2 +
eclipse-testframework-libraryXml.patch | 92 ++++++++++++---------------
eclipse-testframework-nosharedlicense.patch | 2 +-
eclipse-testframework.spec | 13 ++--
sources | 2 +-
5 files changed, 53 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a01788..6d3adf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ eclipse-testframework-fetched-src-R3_7.tar.bz2
eclipse-testframework-fetched-src-I201203021723.tar.bz2
/eclipse-testframework-fetched-src-I201203021723
/noarch
+eclipse-testframework-fetched-src-R4_2.tar.bz2
+/eclipse-testframework-fetched-src-R4_2
diff --git a/eclipse-testframework-fetch-src.sh b/eclipse-testframework-fetch-src.sh
old mode 100644
new mode 100755
diff --git a/eclipse-testframework-libraryXml.patch b/eclipse-testframework-libraryXml.patch
index eb2d98c..37ca08a 100644
--- a/eclipse-testframework-libraryXml.patch
+++ b/eclipse-testframework-libraryXml.patch
@@ -1,110 +1,102 @@
---- org.eclipse.test/library.xml.orig 2012-03-02 17:32:50.000000000 +0100
-+++ org.eclipse.test/library.xml 2012-03-05 09:31:45.282908643 +0100
-@@ -38,22 +38,23 @@
+--- org.eclipse.test/library.xml.bak 2012-07-10 12:24:47.000000000 +0200
++++ org.eclipse.test/library.xml 2012-07-10 12:31:59.962824104 +0200
+@@ -38,17 +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>
++ <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>
+ <echo message="basedir = ${basedir}" />
<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="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="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" />
++ <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 +74,12 @@
+@@ -68,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}"/>
-+
++ <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 +93,7 @@
+@@ -82,7 +91,7 @@
</fileset>
</classpath>
<arg line="-application ${application}" />
- <arg line="-data ${data-dir}" />
-+ <arg line="-data ${test-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 +101,20 @@
+@@ -90,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="-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}"/>
++ <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 +122,12 @@
+@@ -100,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}"/>
++ <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 +161,8 @@
+@@ -133,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}"/>
++ <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 +193,8 @@
+@@ -163,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}">
++ <junitreport todir="${results}" tofile="${output-file}">
++ <fileset dir="${tmpresults}">
<include name="${includes}" />
</fileset>
</junitreport>
diff --git a/eclipse-testframework-nosharedlicense.patch b/eclipse-testframework-nosharedlicense.patch
index 8f3fdc0..486f9b6 100644
--- a/eclipse-testframework-nosharedlicense.patch
+++ b/eclipse-testframework-nosharedlicense.patch
@@ -2,7 +2,7 @@
+++ org.eclipse.test-feature/feature.xml 2011-07-06 11:57:38.954036535 -0400
@@ -4,9 +4,7 @@
label="%featureName"
- version="3.5.0.qualifier"
+ version="3.5.100.qualifier"
provider-name="%providerName"
- image="eclipse_update_120.jpg"
- license-feature="org.eclipse.license"
diff --git a/eclipse-testframework.spec b/eclipse-testframework.spec
index 67aba1c..12c8190 100644
--- a/eclipse-testframework.spec
+++ b/eclipse-testframework.spec
@@ -1,13 +1,11 @@
%global install_loc %{_datadir}/eclipse/dropins/testframework
-#There is no branch for 3.8 tagged, so the release contains a date when
-# master was checked out
-%global tag I201203021723
+%global tag R4_2
%global easymockVerQual 2.4.0.v20090202-0900
Name: eclipse-testframework
-Version: 3.8.0
-Release: 0.2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
Summary: Eclipse Test Framework
Group: Development/Tools
@@ -76,9 +74,12 @@ popd
%defattr(-,root,root,-)
%{install_loc}
%doc org.eclipse.test/about.html
-%doc org.eclipse.test-feature/rootfiles/epl-v10.html
+%doc org.eclipse.test-feature/rootfiles/notice.html
%changelog
+* Tue Jul 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 4.2.0-1
+- Update to latest Juno release.
+
* Thu Apr 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.2
- Update to Eclipse 4.2.
- Make hamcrest a symlink.
diff --git a/sources b/sources
index 03b39d6..1df62e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4d70e32fd0322978435808a23b312a5 eclipse-testframework-fetched-src-I201203021723.tar.bz2
\ No newline at end of file
+39177332e57163c5f835627dbc96b753 eclipse-testframework-fetched-src-R4_2.tar.bz2
More information about the scm-commits
mailing list