Author: tbooth-guest
Date: 2015-08-14 16:14:47 +0000 (Fri, 14 Aug 2015)
New Revision: 19937
Modified:
trunk/packages/libsis-jhdf5-java/trunk/debian/control
trunk/packages/libsis-jhdf5-java/trunk/debian/rules
Log:
The junit tests are now invoked. For they don't all pass but we are close!
Still need to ensure that the .so and .jar files get installed to the correct
locations,
and also to go back and fix the sis-base package.
Modified: trunk/packages/libsis-jhdf5-java/trunk/debian/control
===================================================================
--- trunk/packages/libsis-jhdf5-java/trunk/debian/control 2015-08-14
14:44:34 UTC (rev 19936)
+++ trunk/packages/libsis-jhdf5-java/trunk/debian/control 2015-08-14
16:14:47 UTC (rev 19937)
@@ -7,7 +7,8 @@
libcommons-io-java,
libsis-base-java,
libhdf5-dev (>= 1.8.13),
- openjdk-7-jdk
+ openjdk-7-jdk,
+ junit4
Standards-Version: 3.9.5
Package: libsis-base-java
Modified: trunk/packages/libsis-jhdf5-java/trunk/debian/rules
===================================================================
--- trunk/packages/libsis-jhdf5-java/trunk/debian/rules 2015-08-14 14:44:34 UTC
(rev 19936)
+++ trunk/packages/libsis-jhdf5-java/trunk/debian/rules 2015-08-14 16:14:47 UTC
(rev 19937)
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export
CLASSPATH=/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/sis-base.jar
+export
CLASSPATH=/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/sis-base.jar:/usr/share/java/junit4.jar
%:
dh $@ --with javahelper
@@ -12,14 +12,15 @@
rm -rf jsrc lib build *.jar
rm -rf source/c/*.log
cd debian/test && rm -f *.h5 *.class
+ cd sourceTest/java && rm -f *.hdf
#find test -name '*.class' -delete
override_dh_auto_build:
# C build
cd source/c && \
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC
-Wl,--exclude-libs,ALL \
- -I/usr/lib/jvm/default-java/include/ \
- jhdf5/*.c hdf-java/*.c -o libsis-jhdf5.so -lz -lhdf5
+ -I/usr/lib/jvm/default-java/include/ -I/usr/include/hdf5/serial
\
+ jhdf5/*.c hdf-java/*.c -o libsis-jhdf5.so -lz -lhdf5_serial
# Java build - see README.source about the file being removed
mkdir jsrc ; cp -r source/java/ch source/java/ncsa jsrc
rm jsrc/ch/systemsx/cisd/hdf5/h5ar/HDF5ArchiverMain.java
@@ -27,8 +28,10 @@
jh_build sis-jhdf5.jar jsrc
override_dh_auto_test:
- # Try our little test snippet.
- export CLASSPATH=".:`readlink -f sis-jhdf5.jar`" JNIPATH="`readlink -f
source/c`" ; \
- cd debian/test && javac *.java && \
- java -Djava.library.path="$$JNIPATH" ReadWriteTest
+ # Run the tests that come with the upstream source.
+ export CLASSPATH=".:`readlink -f sis-jhdf5.jar`:$(CLASSPATH)"
JNIPATH="`readlink -f source/c`" ; \
+ cd sourceTest/java && \
+ ln -s test/hdf5lib/h5ex_g_iterate.hdf . && \
+ find test -name '*.java' | xargs javac && \
+ java -Xmx2048M -Djava.library.path="$$JNIPATH"
org.junit.runner.JUnitCore test.hdf5lib.TestAll
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
