rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tests.

This commit is contained in:
Krzysztof Daniel 2013-05-07 12:40:03 +02:00
parent 5eaee80112
commit c3f4c27583
2 changed files with 50 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
eclipse-test-support.patch
View File

@ -81,7 +81,7 @@
+ pushd /tmp/eclipse-tests-directory + pushd /tmp/eclipse-tests-directory
+ rm -rf * + rm -rf *
+ cp ${testslocation}/*.properties . + cp ${testslocation}/*.properties .
+ + cp ${testslocation}/library.xml .
if [ ! -r eclipse ] if [ ! -r eclipse ]
then then
- tar -xzf eclipse-SDK-*.tar.gz - tar -xzf eclipse-SDK-*.tar.gz
@ -153,9 +153,9 @@
- else - else
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger - $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
- fi - fi
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2013-04-04 12:11:23.000000000 +0200 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2013-05-01 13:30:04.000000000 +0200
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-04-04 13:51:49.816829140 +0200 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-05-03 14:44:17.278068172 +0200
@@ -163,99 +163,17 @@ @@ -175,99 +175,15 @@
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail --> <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
<target name="setupPlatform"> <target name="setupPlatform">
@ -234,7 +234,7 @@
- <fail - <fail
- unless="platformArchive" - unless="platformArchive"
- message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" /> - message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
-
- <condition - <condition
- property="platformTarget" - property="platformTarget"
- value="platform-zip"> - value="platform-zip">
@ -261,11 +261,10 @@
+ <condition property="platformTarget" value="platform-tar.gz"> + <condition property="platformTarget" value="platform-tar.gz">
+ <contains string="${platformArchive}" substring=".tar.gz" /> + <contains string="${platformArchive}" substring=".tar.gz" />
+ </condition> + </condition>
+
<echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" /> <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
<antcall target="${platformTarget}" /> <antcall target="${platformTarget}" />
</target> </target>
@@ -283,7 +201,7 @@ @@ -295,7 +211,7 @@
<exec <exec
dir="${platformLocation}" dir="${platformLocation}"
executable="tar"> executable="tar">
@ -274,7 +273,7 @@
</exec> </exec>
</target> </target>
@@ -830,6 +748,18 @@ @@ -842,6 +758,18 @@
arg2="" /> arg2="" />
</not> </not>
</condition> </condition>
@ -293,47 +292,15 @@
<antcall target="runSuite" /> <antcall target="runSuite" />
<antcall target="genResults" /> <antcall target="genResults" />
</target> </target>
@@ -1221,7 +1221,7 @@ @@ -1420,7 +1348,17 @@
<target name="all">
- <antcall target="markCurrentTime">
+ <!--antcall target="markCurrentTime">
<param
name="message" name="message"
value="start relEng" /> value="end longRunningTests" />
@@ -1231,7 +1231,7 @@
<param
name="message"
value="end relEng" />
- </antcall>
+ </antcall-->
<antcall target="markCurrentTime">
<param
@@ -1363,6 +1293,32 @@
value="end longrunning" />
</antcall> </antcall>
-
+ <!-- Copy over the XML to generate a top-level report for all of the tests --> + <!-- Copy over the XML to generate a top-level report for all of the tests -->
+ <mkdir dir="${results}/origXml" /> + <mkdir dir="${results}/origXml" />
+ <xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/> + <xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <!-- Aggregate XML report files --> + <!-- Aggregate XML report files -->
+ <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml"> + <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
+ <fileset dir="${results}/origXml" includes="*.xml" /> + <fileset dir="${results}/origXml" includes="*.xml" />
@ -344,7 +311,7 @@
</target> </target>
<!-- <!--
@@ -1409,7 +1339,7 @@ @@ -1461,7 +1399,7 @@
<antcall target="e4CssSwt" /> <antcall target="e4CssSwt" />
<antcall target="e4UI" /> <antcall target="e4UI" />
<antcall target="equinoxds" /> <antcall target="equinoxds" />
@ -353,12 +320,20 @@
<antcall target="bidi" /> <antcall target="bidi" />
<antcall target="ltkuirefactoringtests" /> <antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" /> <antcall target="ltkcorerefactoringtests" />
@@ -1419,7 +1349,7 @@ @@ -1475,7 +1413,6 @@
hang, during performance testss <antcall target="osgi" />
--> <antcall target="coreresources" />
<target name="platformLR"> <antcall target="equinoxp2" />
- <antcall target="teamcvs" /> - <antcall target="teamcvs" />
+ <!--antcall target="teamcvs" /-->
<antcall target="jface" /> <antcall target="jface" />
<antcall target="swt" /> <antcall target="ui" />
<antcall target="uiperformance" /> <antcall target="uiperformance" />
@@ -1558,7 +1495,7 @@
<property
name="message"
value="no message given by caller" />
- <markTime msg="${message}" />
+ <!--markTime msg="${message}" /-->
</target>
</project>

34
eclipse.spec
View File

@ -52,7 +52,7 @@ fi;
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse Name: %{?scl_prefix}eclipse
Version: %{eclipse_version} Version: %{eclipse_version}
Release: 0.41%{?dist} Release: 0.42%{?dist}
License: EPL License: EPL
Group: Development/Tools Group: Development/Tools
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -104,12 +104,6 @@ Patch10: %{pkg_name}-pdebuild-add-target.patch
# additional poms are a part of e-b # additional poms are a part of e-b
Patch11: %{pkg_name}-change-build-packagings.patch Patch11: %{pkg_name}-change-build-packagings.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
#Patch12: %{pkg_name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
#Patch13: %{pkg_name}-build-filesystem-native-libs.patch
Patch14: %{pkg_name}-test-support.patch Patch14: %{pkg_name}-test-support.patch
Patch17: %{pkg_name}-secondary-arches.patch Patch17: %{pkg_name}-secondary-arches.patch
@ -340,9 +334,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch9 %patch9
%patch10 %patch10
%patch11 %patch11
#%patch12 %patch14
#%patch13
#%patch14
%patch17 %patch17
%patch18 %patch18
%patch20 %patch20
@ -415,19 +407,6 @@ sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/ja
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
#sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
#sed -i -e "s/new Equinox(configuration1)/new Equinox((Map<String, ?>) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
#sed -i -e "s/new Equinox(configuration2)/new Equinox((Map<String, ?>) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
#sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
# Other compilation problems caused by 1.4 -> 1.5 change
#sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
#sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=399617
#find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
#This part generates secondary fragments using primary fragments. #This part generates secondary fragments using primary fragments.
pushd eclipse.platform.swt.binaries/bundles pushd eclipse.platform.swt.binaries/bundles
@ -541,11 +520,6 @@ pushd dropins/jdt/plugins
rm -f $f rm -f $f
ln -s %{_javadir}/hamcrest/core.jar $f ln -s %{_javadir}/hamcrest/core.jar $f
#pushd org.junit_3.8.2.*
#rm -f junit.jar
#ln -s /usr/share/java/junit.jar
#popd
rm -rf org.junit_4* rm -rf org.junit_4*
ln -s /usr/share/java/junit.jar ln -s /usr/share/java/junit.jar
popd popd
@ -735,6 +709,7 @@ sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%
unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/ unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/
unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
@ -1020,6 +995,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog %changelog
* Tue May 7 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.42
- Fix tests.
* Thu May 02 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.41 * Thu May 02 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.41
- Update to latest upstream. - Update to latest upstream.