[gant] Fix tests run
Lubomir Rintel
lkundrak at fedoraproject.org
Sat Dec 11 20:33:11 UTC 2010
commit 6daebb016de99f07338e9ab9bc9097f54474ea28
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat Dec 11 21:32:46 2010 +0100
Fix tests run
0001-Set-includeantruntime.patch | 61 ++++++++++++++++++++++++++++++++++++++
gant.spec | 7 ++++-
gant_src-1.8.1.tgz | Bin 0 -> 1078865 bytes
3 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/0001-Set-includeantruntime.patch b/0001-Set-includeantruntime.patch
new file mode 100644
index 0000000..2c1f23b
--- /dev/null
+++ b/0001-Set-includeantruntime.patch
@@ -0,0 +1,61 @@
+From af73d2549325d6d4d5b3e1ba09a0123a8d766d57 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Sat, 11 Dec 2010 21:26:12 +0100
+Subject: [PATCH] Set includeantruntime
+
+Othewise a test would fail:
+
+Testsuite: gant.targets.tests.Maven_Test
+Tests run: 12, Failures: 1, Errors: 0, Time elapsed: 5.486 sec
+
+Testcase: testLoadingTargets took 0.345 sec
+Testcase: testCompileTargetInDirectoryOtherThanTheCurrentBuildDirectory took 2.926 sec
+ FAILED
+expected:<...classes
+ [javac] []Compiling 1 source f...> but was:<...classes
+ [javac] [: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] ]Compiling 1 source f...>
+junit.framework.ComparisonFailure: expected:<...classes
+ [javac] []Compiling 1 source f...> but was:<...classes
+ [javac] [: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
+ [javac] ]Compiling 1 source f...>
+ at groovy.util.GroovyTestCase.assertEquals(GroovyTestCase.java:440)
+ at org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:88)
+ at groovy.lang.MetaMethod.doMethodInvoke(MetaMethod.java:233)
+ at groovy.lang.MetaClassImpl.invokeStaticMethod(MetaClassImpl.java:1326)
+ at org.codehaus.groovy.runtime.callsite.StaticMetaClassSite.callStatic(StaticMetaClassSite.java:62)
+ at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCallStatic(CallSiteArray.java:48)
+ at org.codehaus.groovy.runtime.callsite.AbstractCallSite.callStatic(AbstractCallSite.java:167)
+ at org.codehaus.groovy.runtime.callsite.AbstractCallSite.callStatic(AbstractCallSite.java:179)
+ at gant.targets.tests.Maven_Test.testCompileTargetInDirectoryOtherThanTheCurrentBuildDirectory(Maven_Test.groovy:56)
+
+Testcase: testPackageNoGroupIdLeftShift took 0.232 sec
+Testcase: testPackageNoGroupIdPower took 0.167 sec
+Testcase: testPackageNoArtifactIdLeftShift took 0.497 sec
+Testcase: testPackageNoArtifactIdPower took 0.153 sec
+Testcase: testPackageVersionLeftShift took 0.228 sec
+Testcase: testPackageVersionPower took 0.155 sec
+Testcase: testBindingPropertyIsReadOnlyLeftShift took 0.225 sec
+Testcase: testBindingPropertyIsReadOnlyPower took 0.144 sec
+Testcase: testAdditionalTarget took 0.171 sec
+Testcase: testAdditionalTargetError took 0.211 sec
+---
+ src/main/groovy/gant/targets/Maven.groovy | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/groovy/gant/targets/Maven.groovy b/src/main/groovy/gant/targets/Maven.groovy
+index 971e922..17af145 100644
+--- a/src/main/groovy/gant/targets/Maven.groovy
++++ b/src/main/groovy/gant/targets/Maven.groovy
+@@ -36,7 +36,7 @@ final class Maven {
+ testCompilePath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
+ testReportPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
+ metadataPath : '' , // Defaults to standard Maven 2 convention. Set in constructor since it uses a GString dependent on a value in the map.
+- javaCompileProperties : [ source : '1.5' , target : '1.5' , debug : 'false' ] ,
++ javaCompileProperties : [ includeantruntime : 'false' , source : '1.5' , target : '1.5' , debug : 'false' ] ,
+ groovyCompileProperties : [ : ] ,
+ nestedJavacCompilerArgs : [ ] ,
+ compileClasspath : [ ] ,
+--
+1.7.3.3
+
diff --git a/gant.spec b/gant.spec
index fbc5f32..d4daeea 100644
--- a/gant.spec
+++ b/gant.spec
@@ -11,7 +11,7 @@
Name: gant
Version: 1.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Groovy-based build system that uses Ant tasks
Group: Development/Tools
@@ -22,6 +22,7 @@ Source1: gant-script
Patch0: 0001-Make-it-build-against-our-jars.patch
Patch1: 0001-Fix-tests.patch
Patch2: gant-1.8.1-groovy7.patch
+Patch3: 0001-Set-includeantruntime.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: groovy
@@ -54,6 +55,7 @@ specify the rules.
%patch0 -p1 -b .build
%patch1 -p1 -b .tests
%patch2 -p1 -b .groovy7
+%patch3 -p1 -b .includeantruntime
%build
@@ -113,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 11 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-5
+- Fix tests run
+
* Fri Mar 5 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-4
- Include JDK tools in classpath
diff --git a/gant_src-1.8.1.tgz b/gant_src-1.8.1.tgz
new file mode 100644
index 0000000..efecfa8
Binary files /dev/null and b/gant_src-1.8.1.tgz differ
More information about the scm-commits
mailing list