[eclipse-testframework] - Update the fetch script to use the git repository - Update sources to the master
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Mar 5 09:44:17 UTC 2012
commit ae5c2f8b1b77c98296d567bdc55c5f81bc6a3de8
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Mar 5 10:43:07 2012 +0100
- Update the fetch script to use the git repository
- Update sources to the master
.gitignore | 1 +
eclipse-testframework-fetch-src.sh | 23 +++++++--
eclipse-testframework-libraryXml.patch | 91 ++++++++++++++++---------------
eclipse-testframework.spec | 14 ++++--
sources | 2 +-
5 files changed, 78 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d113ea..6a54292 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ eclipse-testframework-fetched-src-R3_6.tar.bz2
/eclipse-testframework-fetched-src-R3_6_1.tar.bz2
/eclipse-testframework-fetched-src-R3_7
eclipse-testframework-fetched-src-R3_7.tar.bz2
+eclipse-testframework-fetched-src-I201203021723.tar.bz2
diff --git a/eclipse-testframework-fetch-src.sh b/eclipse-testframework-fetch-src.sh
index ce6c85e..9edd84c 100644
--- a/eclipse-testframework-fetch-src.sh
+++ b/eclipse-testframework-fetch-src.sh
@@ -12,19 +12,34 @@ fi
rm -fr $tar_name && mkdir $tar_name
pushd $tar_name
-# Fetch plugins
+#clone the repo
+git clone git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.git
+
+#enter the repo
+cd eclipse.platform.releng
+git checkout $tag
+
+#copy out interesting plugins
for f in \
org.eclipse.ant.optional.junit \
org.eclipse.test \
org.eclipse.test.performance \
-org.eclipse.test-feature \
; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r $tag $f;
+mv bundles/$f ../
done
+#copy the feature
+mv features/org.eclipse.test-feature ../
+
+#leave the repo and delete it
+cd .. && rm -rf eclipse.platform.releng
+
# Remove code coverage JARs
rm org.eclipse.test/lib/jaco*.jar
-
popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name
+
+if [ $tag = 'master' ]; then
+echo "Do not forget to rename the archive to match current date!!!";
+fi
\ No newline at end of file
diff --git a/eclipse-testframework-libraryXml.patch b/eclipse-testframework-libraryXml.patch
index 1ff7f19..eb2d98c 100644
--- a/eclipse-testframework-libraryXml.patch
+++ b/eclipse-testframework-libraryXml.patch
@@ -1,107 +1,110 @@
---- 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 @@
+--- 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 @@
<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>
+- <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="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 +73,11 @@
+@@ -73,7 +74,12 @@
<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 +91,7 @@
+@@ -87,7 +93,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 +99,20 @@
+@@ -95,9 +101,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 +120,11 @@
+@@ -105,6 +122,12 @@
<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 +158,8 @@
+@@ -138,6 +161,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 +190,8 @@
+@@ -168,8 +193,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.spec b/eclipse-testframework.spec
index b7ed86a..4174882 100644
--- a/eclipse-testframework.spec
+++ b/eclipse-testframework.spec
@@ -1,12 +1,14 @@
%global eclipse_base %{_libdir}/eclipse
%global install_loc %{_datadir}/eclipse/dropins/testframework
-%global tag R3_7
+#There is no branch for 3.8 tagged, so the release contains a date when
+# master was checked out
+%global tag I201203021723
%global easymockVerQual 2.4.0.v20090202-0900
Name: eclipse-testframework
Version: 3.7.0
-Release: 3%{?dist}
+Release: 0.4%{?dist}
Summary: Eclipse Test Framework
Group: Development/Tools
@@ -28,9 +30,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-pde >= 1:3.8.0
BuildRequires: easymock2
-Requires: eclipse-platform >= 3.5.0
+Requires: eclipse-platform >= 3.8.0
Requires: easymock2
Requires: eclipse-jdt
@@ -76,6 +78,10 @@ popd
%doc org.eclipse.test-feature/rootfiles/epl-v10.html
%changelog
+* Mon Mar 5 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-4
+- Update the fetch script to use the git repository
+- Update sources to the master
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 96d52d3..03b39d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a32bacac509f33137c18cf66c468a8b eclipse-testframework-fetched-src-R3_7.tar.bz2
+a4d70e32fd0322978435808a23b312a5 eclipse-testframework-fetched-src-I201203021723.tar.bz2
\ No newline at end of file
More information about the scm-commits
mailing list