Package: libmysofa
Version: 1.3.1~dfsg0-1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu mantic ubuntu-patch
The build tests are currently disabled and have been since the package
was added but they seem to work correctly nowadays (tested in a Debian
container and on Ubuntu builders[1]). The attached patch enable those
Cheers,
Sébastien
[1] https://launchpad.net/ubuntu/+source/libmysofa/1.3.1~dfsg0-1ubuntu1
diff -Nru libmysofa-1.3.1~dfsg0/debian/changelog libmysofa-1.3.1~dfsg0/debian/changelog
--- libmysofa-1.3.1~dfsg0/debian/changelog 2022-10-15 22:04:48.000000000 +0200
+++ libmysofa-1.3.1~dfsg0/debian/changelog 2023-05-17 11:36:35.000000000 +0200
@@ -1,3 +1,13 @@
+libmysofa (1.3.1~dfsg0-2) UNRELEASED; urgency=medium
+
+ * debian/control, debian/rules:
+ - enable build tests
+ * debian/patches/debian_ignore_tests.patch:
+ - ignore tests that require .sofa files which are excluded from the dfsg
+ tarball.
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Wed, 17 May 2023 11:36:35 +0200
+
libmysofa (1.3.1~dfsg0-1) unstable; urgency=medium
* New upstream version 1.3.1~dfsg0
diff -Nru libmysofa-1.3.1~dfsg0/debian/control libmysofa-1.3.1~dfsg0/debian/control
--- libmysofa-1.3.1~dfsg0/debian/control 2022-10-15 22:04:48.000000000 +0200
+++ libmysofa-1.3.1~dfsg0/debian/control 2023-05-17 11:36:35.000000000 +0200
@@ -1,12 +1,14 @@
Source: libmysofa
Priority: optional
-Maintainer: Debian Multimedia Maintainers <debian-multime...@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <debian-multime...@lists.debian.org>
Uploaders:
IOhannes m zmölnig (Debian/GNU) <umlae...@debian.org>,
Build-Depends:
cmake,
debhelper-compat (= 13),
libcunit1-dev,
+ nodejs <!nocheck>,
zlib1g-dev | libz-dev,
Standards-Version: 4.6.1
Rules-Requires-Root: no
diff -Nru libmysofa-1.3.1~dfsg0/debian/patches/series libmysofa-1.3.1~dfsg0/debian/patches/series
--- libmysofa-1.3.1~dfsg0/debian/patches/series 2022-10-15 22:04:48.000000000 +0200
+++ libmysofa-1.3.1~dfsg0/debian/patches/series 2023-05-17 11:36:35.000000000 +0200
@@ -1 +1,2 @@
dynamically-link-tools.patch
+debian_ignore_tests.patch
diff -Nru libmysofa-1.3.1~dfsg0/debian/patches/debian_ignore_tests.patch libmysofa-1.3.1~dfsg0/debian/patches/debian_ignore_tests.patch
--- libmysofa-1.3.1~dfsg0/debian/patches/debian_ignore_tests.patch 1970-01-01 01:00:00.000000000 +0100
+++ libmysofa-1.3.1~dfsg0/debian/patches/debian_ignore_tests.patch 2023-05-17 11:36:35.000000000 +0200
@@ -0,0 +1,27 @@
+# Description: ignore tests which depend on non dfsg files that Debian
+# is removing from the tarball
+# Upstream: not-needed
+Index: libmysofa-1.3.1~dfsg0/CMakeLists.txt
+===================================================================
+--- libmysofa-1.3.1~dfsg0.orig/CMakeLists.txt 2022-10-04 18:31:49.000000000 +0200
++++ libmysofa-1.3.1~dfsg0/CMakeLists.txt 2023-05-17 15:38:45.843397388 +0200
+@@ -57,8 +57,6 @@
+ ${PROJECT_SOURCE_DIR}/tests/Mesh2HRTF.sofa)
+ add_test(D1_48K_24bit_0.3s_FIR_SOFA src/mysofa2json
+ ${PROJECT_SOURCE_DIR}/tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa)
+- add_test(H20_44K_16bit_256tap_FIR_SOFA ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
+- ${PROJECT_SOURCE_DIR}/tests/H20_44K_16bit_256tap_FIR_SOFA)
+ add_test(MIT_KEMAR_large_pinna ${PROJECT_SOURCE_DIR}/tests/compare.sh
+ ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_large_pinna)
+ add_test(MIT_KEMAR_normal_pinna ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh
+@@ -104,10 +102,6 @@
+ ${PROJECT_SOURCE_DIR}/tests/LISTEN_1002_IRC_1002_C_HRIR)
+ add_test(Pulse ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/Pulse)
+ add_test(Tester ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/tester)
+- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ${PROJECT_SOURCE_DIR}/tests/compare.sh
+- ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m)
+- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ${PROJECT_SOURCE_DIR}/tests/compare.sh
+- ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m)
+ add_test(example_dummy_sofa48 ${PROJECT_SOURCE_DIR}/tests/compare.sh
+ ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48)
+ add_test(TestSOFA48_netcdf472 ${PROJECT_SOURCE_DIR}/tests/compare.sh
diff -Nru libmysofa-1.3.1~dfsg0/debian/rules libmysofa-1.3.1~dfsg0/debian/rules
--- libmysofa-1.3.1~dfsg0/debian/rules 2022-10-15 22:04:48.000000000 +0200
+++ libmysofa-1.3.1~dfsg0/debian/rules 2023-05-17 11:36:35.000000000 +0200
@@ -13,8 +13,9 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+# the tests have hardcoded reference to build/src
%:
- dh $@
+ dh $@ --builddirectory=build
override_dh_auto_configure:
dh_auto_configure -- \
@@ -23,9 +24,9 @@
-DCODE_COVERAGE=OFF \
$(empty)
+# no-parallel otherwise we are hitting test errors
override_dh_auto_test:
- # tests have been disabled, until we figure out how to make them not stall
- @echo "skipping tests"
+ dh_auto_test --no-parallel
override_dh_clean:
dh_clean
