r47288 - in /packages/healpix/healpix-java/trunk/debian: changelog javabuild rules tests/build-and-junit tests/control

[lsinger-guest at users.alioth.debian.org]

Author: lsinger-guest
Date: Sat Jun  4 04:19:18 2016
New Revision: 47288

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47288
Log:
healpix-java: drop dependency on junit

Added:
    packages/healpix/healpix-java/trunk/debian/tests/build-and-junit   (with props)
Modified:
    packages/healpix/healpix-java/trunk/debian/changelog
    packages/healpix/healpix-java/trunk/debian/javabuild
    packages/healpix/healpix-java/trunk/debian/rules
    packages/healpix/healpix-java/trunk/debian/tests/control

Modified: packages/healpix/healpix-java/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-java/trunk/debian/changelog?rev=47288&op=diff
==============================================================================
--- packages/healpix/healpix-java/trunk/debian/changelog	(original)
+++ packages/healpix/healpix-java/trunk/debian/changelog	Sat Jun  4 04:19:18 2016
@@ -1,6 +1,8 @@
 healpix-java (3.30-2) UNRELEASED; urgency=medium
 
   * Add continuous integration testing.
+  * Remove unit tests from package.
+  * Drop dependency on junit.
 
  -- Leo Singer <leo.singer at ligo.org>  Fri, 03 Jun 2016 20:47:29 -0400
 

Modified: packages/healpix/healpix-java/trunk/debian/javabuild
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-java/trunk/debian/javabuild?rev=47288&op=diff
==============================================================================
--- packages/healpix/healpix-java/trunk/debian/javabuild	(original)
+++ packages/healpix/healpix-java/trunk/debian/javabuild	Sat Jun  4 04:19:18 2016
@@ -1 +1 @@
-jhealpix.jar src/healpix
+jhealpix.jar src/healpix/essentials/*.java

Modified: packages/healpix/healpix-java/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-java/trunk/debian/rules?rev=47288&op=diff
==============================================================================
--- packages/healpix/healpix-java/trunk/debian/rules	(original)
+++ packages/healpix/healpix-java/trunk/debian/rules	Sat Jun  4 04:19:18 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/junit.jar:/usr/share/java/fits.jar
+export CLASSPATH=/usr/share/java/fits.jar
 
 %:
 	dh $@ --with javahelper
@@ -10,4 +10,5 @@
 	dh_installchangelogs CHANGES
 
 override_dh_auto_test:
-	CLASSPATH=jhealpix.jar debian/tests/junit
+	CLASSPATH=jhealpix.jar:/usr/share/java/junit.jar jh_build -N test.jar src/healpix/essentials/test
+	CLASSPATH=test.jar debian/tests/junit

Added: packages/healpix/healpix-java/trunk/debian/tests/build-and-junit
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-java/trunk/debian/tests/build-and-junit?rev=47288&op=file
==============================================================================
--- packages/healpix/healpix-java/trunk/debian/tests/build-and-junit	(added)
+++ packages/healpix/healpix-java/trunk/debian/tests/build-and-junit	Sat Jun  4 04:19:18 2016
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+CLASSPATH=/usr/share/java/jhealpix.jar:/usr/share/java/junit.jar jh_build -N $ADTTMP/test.jar src/healpix/essentials/test
+CLASSPATH=$ADTTMP/test.jar debian/tests/junit

Propchange: packages/healpix/healpix-java/trunk/debian/tests/build-and-junit
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/healpix/healpix-java/trunk/debian/tests/control
URL: http://svn.debian.org/wsvn/debian-science/packages/healpix/healpix-java/trunk/debian/tests/control?rev=47288&op=diff
==============================================================================
--- packages/healpix/healpix-java/trunk/debian/tests/control	(original)
+++ packages/healpix/healpix-java/trunk/debian/tests/control	Sat Jun  4 04:19:18 2016
@@ -1,2 +1,3 @@
-Depends: libhealpix-java
-Test-Command: CLASSPATH=/usr/share/java/jhealpix.jar debian/tests/junit
+Depends: libhealpix-java, junit
+Restrictions: allow-stderr
+Test-Command: debian/tests/build-and-junit