I've applied the patch. Wrt to rpm-3 I can't judge if your provided patch is ok. But we should probably discuss this in JIRA.
/Anders On Tue, Aug 21, 2012 at 8:13 PM, Graham Leggett <[email protected]> wrote: > On 21 Aug 2012, at 8:08 PM, Anders Hammar wrote: > >> I've set up CI build at Codehaus Bamboo [1]. >> IT rpm-3 fails. Not good, but a lot better than locally on my Mac... >> >> [1] http://bamboo.ci.codehaus.org/browse/MOJO-MRPM > > I went through the tests and corrected the assertion failed messages so they > made sense: > > http://jira.codehaus.org/browse/MRPM-120 > > If this can be applied, I can then hunt down the failures. > > The following patch fixes the rpm-3 test (from > http://jira.codehaus.org/browse/MRPM-107): > > Index: src/it/rpm-3/pom.xml > =================================================================== > --- src/it/rpm-3/pom.xml (revision 17158) > +++ src/it/rpm-3/pom.xml (working copy) > @@ -49,7 +49,7 @@ > <defineStatements> > <defineStatement>_unpackaged_files_terminate_build > 0</defineStatement> > </defineStatements> > - <needarch>someArch</needarch> > + <needarch>somearch</needarch> > <targetOS>someOS</targetOS> > <defaultUsername>myuser</defaultUsername> > <defaultGroupname>mygroup</defaultGroupname> > @@ -132,7 +132,7 @@ > <source> > <location>src/main/bin2/rename.sh</location> > <destination>name-someArch.sh</destination> > - <targetArchitecture>.*Arch</targetArchitecture> > + <targetArchitecture>.*arch</targetArchitecture> > </source> > <source> > <location>src/main/bin2/rename.sh</location> > > Regards, > Graham > -- > --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
