From 0c1daf2f7f74ba8f4c45174b781a8306c9bbc73b Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Wed, 5 Sep 2012 12:14:23 +0200 Subject: [PATCH] Improvement to the test. --- eclipse-test-support.patch | 11 +++++++++++ eclipse.spec | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch index 721a9b4..687f0d0 100644 --- a/eclipse-test-support.patch +++ b/eclipse-test-support.patch @@ -211,3 +211,14 @@ +--- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-04 11:45:10.000000000 +0200 ++++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-05 11:21:20.379946308 +0200 +@@ -914,7 +914,7 @@ + + + +- ++ + + + diff --git a/eclipse.spec b/eclipse.spec index 2486763..1dff356 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -890,10 +890,18 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ ############## unzip TMP/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests -unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-v20120904-0831.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/ - +unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/ +rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/runtests.bat +pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/plugins +rm -rf org.easymock_*.jar +rm -rf org.hamcrest.core_*.jar +rm -rf org.junit_*.jar +rm -rf org.junit4_*.jar +popd + + sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/runtests.sh touch $RPM_BUILD_ROOT%{_bindir}/%{name}-runEclipsePackageTests