Pierre Gruet a écrit le 30/04/2020 à 23:45 :
> Thanks for looking at the issue and proposing a fix. It is very helpful!
> I will thus look at it and investigate further the failures that remain.
This package looks weird. Where does the mix-up between libhdf5-java and
libsis-jhdf5-java come from? There shouldn't have any dependency to
libhdf5-java as I understand it. The tests failures come from this
confusion.
Using the attached patch, the package builds correctly and only 10
failing test cases remain.
BTW the override_dh_auto_clean target should be reintroduced.
Best,
_g.
diff --git a/debian/control b/debian/control
index 63213c8..df8b3f2 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,7 @@ Build-Depends: debhelper-compat (= 12),
testng,
libhamcrest-java,
libjmock2-java,
- libobjenesis-java,
- libhdf5-java <!nocheck>
+ libobjenesis-java
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/libsis-jhdf5-java
Vcs-Git: https://salsa.debian.org/med-team/libsis-jhdf5-java.git
diff --git a/debian/rules b/debian/rules
index b64e410..4d6439b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_build:
cd source/c && \
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -Wl,--exclude-libs,ALL \
-I/usr/lib/jvm/default-java/include/ -I/usr/include/hdf5/serial \
- *.c jni/*.c -o libsis-jhdf5.so -lz -lhdf5_serial
+ *.c jni/*.c -o libjhdf5.so -lz -lhdf5_serial
override_jh_installlibs:
mv targets/gradle/libs/sis-jhdf5-1.jar targets/gradle/libs/sis-jhdf5.jar
diff --git a/debian/tests/providedTests b/debian/tests/providedTests
index f07438a..affc631 100644
--- a/debian/tests/providedTests
+++ b/debian/tests/providedTests
@@ -19,7 +19,7 @@ TESTCLASSPATH=/usr/share/java/junit4.jar:/usr/share/java/testng.jar:/usr/share/j
export CLASSPATH="$SOURCEDIR/sourceTest/java:/usr/share/java/sis-jhdf5.jar:$TESTCLASSPATH" \
JNIPATH="`readlink -f source/c`:/usr/lib/jni" \
TZ=Europe/Zurich LC_ALL=C
-export COMPILPATH=/usr/share/java/commons-lang3.jar:/usr/share/java/commons-io.jar:/usr/share/java/sis-base.jar:/usr/share/java/jarhdf5.jar
+export COMPILPATH=/usr/share/java/commons-lang3.jar:/usr/share/java/commons-io.jar:/usr/share/java/sis-base.jar:/usr/share/java/sis-jhdf5.jar
find $SOURCEDIR/sourceTest/java -name '*.java' | env CLASSPATH="$CLASSPATH:$COMPILPATH" xargs javac && \
- java -Xmx2048M -Djava.library.path=/usr/lib/jni -Dnative.libpath.jhdf5=/usr/lib/x86_64-linux-gnu/jni/libhdf5_java.so org.testng.TestNG -verbose 2 $SOURCEDIR/sourceTest/java/tests.xml
+ java -Xmx2048M -Djava.library.path=/usr/lib/jni org.testng.TestNG -verbose 2 $SOURCEDIR/sourceTest/java/tests.xml
