[pkg-eucalyptus-commits] r187 - netty/trunk/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Feb 12 11:47:06 UTC 2012
Author: drazzib
Date: 2012-02-12 11:47:05 +0000 (Sun, 12 Feb 2012)
New Revision: 187
Removed:
netty/trunk/debian/orig-tar.sh
Modified:
netty/trunk/debian/README.source
netty/trunk/debian/build.xml
netty/trunk/debian/changelog
netty/trunk/debian/control
netty/trunk/debian/rules
Log:
* Merge from James Page (thanks!):
* Enable test suite to support Ubuntu MIR (LP: #913878) (Closes: #658250):
- d/build.xml: Add extra targets to compile and execute unit tests.
- d/rules: Add testing dependencies to build classpath.
- d/control: Added junit4 and libeasymock-java to BDI's and ant-optional
to BD's.
* d/orig-tar.sh; Dropped - not used.
Modified: netty/trunk/debian/README.source
===================================================================
--- netty/trunk/debian/README.source 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/README.source 2012-02-12 11:47:05 UTC (rev 187)
@@ -13,3 +13,11 @@
[1] http://www.jboss.org/netty/downloads.html
-- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
+
+Test Suite Execution
+--------------------
+
+The unit test suite has been enabled based on a) the features built from this
+source package and b) the version of easymock currently avaliable in the archive.
+
+ -- James Page <james.page at ubuntu.com> Tue, 24 Jan 2012 09:02:56 +0000
Modified: netty/trunk/debian/build.xml
===================================================================
--- netty/trunk/debian/build.xml 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/build.xml 2012-02-12 11:47:05 UTC (rev 187)
@@ -2,8 +2,12 @@
<project name="pkg-java" default="package" basedir="..">
<property name="build.sourceDirectory" value="src/main/java"/>
+ <property name="build.testSourceDirectory" value="src/test/java"/>
<property name="build.directory" value="build"/>
<property name="build.outputDirectory" value="${build.directory}/classes"/>
+ <property name="build.testOutputDirectory" value="${build.directory}/test-classes"/>
+ <property name="classpath.full.test" value="${build.testOutputDirectory}:${build.outputDirectory}"/>
+ <property name="build.javaVersion" value="1.5"/>
<target name="clean">
<delete dir="${build.directory}"/>
@@ -14,7 +18,7 @@
<javac
destdir="${build.outputDirectory}"
nowarn="true"
- target="1.5"
+ source="${build.javaVersion}" target="${build.javaVersion}"
deprecation="false"
debug="on">
<src path="${build.sourceDirectory}"/>
@@ -26,7 +30,50 @@
</javac>
</target>
- <target name="package" depends="compile">
+ <patternset id="test.sources.exclude">
+ <exclude name="**/ChannelBuffersTest.java"/>
+ <exclude name="**/JdkLoggerTest.java"/>
+ <exclude name="**/InternalLoggerFactoryTest.java"/>
+ <exclude name="**/Log4JLoggerTest.java"/>
+ <exclude name="org/jboss/netty/logging/JBoss*.java"/>
+ <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
+ <exclude name="**/StackTraceSimplifierTest.java"/>
+ <exclude name="org/jboss/netty/handler/ssl/**"/>
+ <exclude name="**/SwitchableInputStreamTest.java"/>
+ </patternset>
+
+ <target name="test-compile">
+ <mkdir dir="${build.testOutputDirectory}"/>
+ <javac
+ destdir="${build.testOutputDirectory}"
+ classpath="${classpath.full.test}"
+ nowarn="true"
+ source="${build.javaVersion}" target="${build.javaVersion}"
+ debug="on">
+ <src path="${build.testSourceDirectory}"/>
+ <patternset refid="test.sources.exclude"/>
+ </javac>
+ </target>
+
+ <target name="test" depends="test-compile">
+ <mkdir dir="${build.directory}/test-output"/>
+ <junit printsummary="yes" haltonfailure="yes">
+ <sysproperty key="basedir" value="${basedir}"/>
+ <classpath>
+ <pathelement path="${classpath.full.test}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest todir="${build.directory}/test-output">
+ <fileset dir="${build.testSourceDirectory}">
+ <include name="**/*Test.java"/>
+ <exclude name="**/Abstract*"/>
+ <patternset refid="test.sources.exclude"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="package" depends="compile,test">
<jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
basedir="${build.outputDirectory}"/>
</target>
Modified: netty/trunk/debian/changelog
===================================================================
--- netty/trunk/debian/changelog 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/changelog 2012-02-12 11:47:05 UTC (rev 187)
@@ -1,3 +1,15 @@
+netty (1:3.2.6.Final-2) unstable; urgency=low
+
+ * Merge from James Page (thanks!):
+ * Enable test suite to support Ubuntu MIR (LP: #913878) (Closes: #658250):
+ - d/build.xml: Add extra targets to compile and execute unit tests.
+ - d/rules: Add testing dependencies to build classpath.
+ - d/control: Added junit4 and libeasymock-java to BDI's and ant-optional
+ to BD's.
+ * d/orig-tar.sh; Dropped - not used.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 12 Feb 2012 12:43:50 +0100
+
netty (1:3.2.6.Final-1) unstable; urgency=low
* New upstream release (Closes: #643832):
Modified: netty/trunk/debian/control
===================================================================
--- netty/trunk/debian/control 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/control 2012-02-12 11:47:05 UTC (rev 187)
@@ -7,12 +7,14 @@
Kyo Lee <kyo.lee at eucalyptus.com>,
Damien Raude-Morvan <drazzib at debian.org>
Build-Depends-Indep: default-jdk,
+ junit4,
libcommons-logging-java,
+ libeasymock-java,
liblog4j1.2-java,
libservlet2.5-java,
libslf4j-java,
maven-repo-helper
-Build-Depends: ant, cdbs (>= 0.4.5.3), debhelper (>= 7)
+Build-Depends: ant, ant-optional, cdbs (>= 0.4.5.3), debhelper (>= 7)
Standards-Version: 3.9.2
Homepage: http://www.jboss.org/netty
Vcs-Svn: svn://svn.debian.org/svn/pkg-eucalyptus/netty/trunk/
Deleted: netty/trunk/debian/orig-tar.sh
===================================================================
--- netty/trunk/debian/orig-tar.sh 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/orig-tar.sh 2012-02-12 11:47:05 UTC (rev 187)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# $1 = version
-TAR=../netty_$2.orig.tar.gz
-DIR=libnetty-java-$2.orig
-
-# clean up the upstream tarball
-svn export http://anonsvn.jboss.org/repos/netty/tags/netty-$2/ $DIR
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-rm ../netty-$2
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
Modified: netty/trunk/debian/rules
===================================================================
--- netty/trunk/debian/rules 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/trunk/debian/rules 2012-02-12 11:47:05 UTC (rev 187)
@@ -8,7 +8,7 @@
DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
-DartifactId=$(DEB_SOURCE_PACKAGE)
DEB_JARS := commons-logging log4j-1.2 servlet-api-2.5 \
- slf4j-api slf4j-log4j12
+ slf4j-api slf4j-log4j12 junit4 easymock ant-junit4 ant-junit
binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java
More information about the pkg-eucalyptus-commits
mailing list