Source: libpappsomspp Version: 0.9.32-1 Severity: important tags: patch
Hello, I found that the package FTBFS when MAKE_TEST is defined but
BUILD_TESTING isn't (e.g. when the package runs with nocheck profile).
I made a patch that consists in
* Move the test in dh_auto_test target (this one is skipped automatically when
nocheck is exported)
* bump compat level to 13 (I think this is the first compat level for the above
to work)
* Export MAKE_TEST=1 BUILD_TESTING=1 when nocheck is not exported
Trivial patch attached
diff -Nru libpappsomspp-0.9.32/debian/changelog
libpappsomspp-0.9.32/debian/changelog
--- libpappsomspp-0.9.32/debian/changelog 2024-05-21 19:16:44.000000000
+0200
+++ libpappsomspp-0.9.32/debian/changelog 2024-05-30 11:36:18.000000000
+0200
@@ -1,3 +1,13 @@
+libpappsomspp (0.9.32-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload (Closes: #-1)
+ * Bump compat level to 13
+ * Run tests in dh_auto_test target, this should fix tests when
+ nocheck is on
+ * Also export -DBUILD_TESTING=1 variable
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Thu, 30 May 2024
11:36:18 +0200
+
libpappsomspp (0.9.32-1) unstable; urgency=low
* New upstream version fixing parallel file-loading bug.
diff -Nru libpappsomspp-0.9.32/debian/control
libpappsomspp-0.9.32/debian/control
--- libpappsomspp-0.9.32/debian/control 2024-05-21 19:16:44.000000000 +0200
+++ libpappsomspp-0.9.32/debian/control 2024-05-30 11:36:18.000000000 +0200
@@ -3,7 +3,7 @@
Uploaders: Filippo Rusconi <lopi...@debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
dh-exec,
cmake,
d-shlibs,
diff -Nru libpappsomspp-0.9.32/debian/rules libpappsomspp-0.9.32/debian/rules
--- libpappsomspp-0.9.32/debian/rules 2024-05-21 19:16:44.000000000 +0200
+++ libpappsomspp-0.9.32/debian/rules 2024-05-30 11:36:18.000000000 +0200
@@ -23,20 +23,23 @@
export LIBPAPPSOMSPP_VERSION=$(DEB_VERSION_UPSTREAM)
export LIBPAPPSOMSPP_SOVERSION=0
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ CMAKE_EXTRA_TESTING_ARGS = -DMAKE_TESTS=1 -DBUILD_TESTING=1
+endif
# Remove -DMAKE_TESTS=1 \ for the moment
# See comment below.
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DMAKE_TESTS=1 \
-DCMAKE_SKIP_RPATH=0 \
- -DUSEPAPPSOTREE=0
+ -DUSEPAPPSOTREE=0 $(CMAKE_EXTRA_TESTING_ARGS)
override_dh_auto_build:
dh_auto_build
dh_auto_build -- doc
+override_dh_auto_test:
# With the monstrous mess of Catch2
# in version 3.x having totally changed
# the header files structure with respect
thanks for considering it,
Gianfranco
diff -Nru libpappsomspp-0.9.32/debian/changelog
libpappsomspp-0.9.32/debian/changelog
--- libpappsomspp-0.9.32/debian/changelog 2024-05-21 19:16:44.000000000
+0200
+++ libpappsomspp-0.9.32/debian/changelog 2024-05-30 11:36:18.000000000
+0200
@@ -1,3 +1,13 @@
+libpappsomspp (0.9.32-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload (Closes: #-1)
+ * Bump compat level to 13
+ * Run tests in dh_auto_test target, this should fix tests when
+ nocheck is on
+ * Also export -DBUILD_TESTING=1 variable
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Thu, 30 May 2024
11:36:18 +0200
+
libpappsomspp (0.9.32-1) unstable; urgency=low
* New upstream version fixing parallel file-loading bug.
diff -Nru libpappsomspp-0.9.32/debian/control
libpappsomspp-0.9.32/debian/control
--- libpappsomspp-0.9.32/debian/control 2024-05-21 19:16:44.000000000 +0200
+++ libpappsomspp-0.9.32/debian/control 2024-05-30 11:36:18.000000000 +0200
@@ -3,7 +3,7 @@
Uploaders: Filippo Rusconi <lopi...@debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
dh-exec,
cmake,
d-shlibs,
diff -Nru libpappsomspp-0.9.32/debian/rules libpappsomspp-0.9.32/debian/rules
--- libpappsomspp-0.9.32/debian/rules 2024-05-21 19:16:44.000000000 +0200
+++ libpappsomspp-0.9.32/debian/rules 2024-05-30 11:36:18.000000000 +0200
@@ -23,20 +23,23 @@
export LIBPAPPSOMSPP_VERSION=$(DEB_VERSION_UPSTREAM)
export LIBPAPPSOMSPP_SOVERSION=0
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ CMAKE_EXTRA_TESTING_ARGS = -DMAKE_TESTS=1 -DBUILD_TESTING=1
+endif
# Remove -DMAKE_TESTS=1 \ for the moment
# See comment below.
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
- -DMAKE_TESTS=1 \
-DCMAKE_SKIP_RPATH=0 \
- -DUSEPAPPSOTREE=0
+ -DUSEPAPPSOTREE=0 $(CMAKE_EXTRA_TESTING_ARGS)
override_dh_auto_build:
dh_auto_build
dh_auto_build -- doc
+override_dh_auto_test:
# With the monstrous mess of Catch2
# in version 3.x having totally changed
# the header files structure with respect
OpenPGP_signature.asc
Description: OpenPGP digital signature
