[med-svn] [Git][med-team/mia][master] 2 commits: (override_dh_auto_test): Define conditionally to skip a test failing on Salsa.

[Yavor Doganov (@yavor-guest)]

Yavor Doganov pushed to branch master at Debian Med / mia


Commits:
79036e58 by Yavor Doganov at 2025-10-18T21:13:39+03:00
(override_dh_auto_test): Define conditionally to skip a test failing on Salsa.

- - - - -
4525398c by Yavor Doganov at 2025-10-18T21:15:42+03:00
rules: Remove workarounds for mips and mipsel.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -7,10 +7,13 @@ mia (2.4.7-14) UNRELEASED; urgency=medium
   [ Yavor Doganov ]
   * debian/patches/gcc-14.patch: New; fix FTBFS with GCC 14 and 15
     (Closes: #1075270).
-  * debian/rules (DEB_CXXFLAGS_MAINT_APPEND): Define conditionally to
-    reduce the log size for the Salsa CI build only.
+  * debian/rules: Remove workarounds for mips and mipsel.
+    (DEB_CXXFLAGS_MAINT_APPEND): Define conditionally to reduce the log
+    size for the Salsa CI build only.
     (override_dh_auto_configure): Pass -DCMAKE_POLICY_VERSION_MINIMUM=3.5
     to fix FTBFS with CMake 4 (Closes: #1113285).
+    (override_dh_auto_test): Define conditionally to skip a test which
+    fails only on Salsa CI, probably due to some limitations there.
   * debian/salsa-ci.yml (build): Forcefully delete .buildinfo/.changes.
     Change build command to reduce the log and obtain something useful.
   * debian/control (libmia-2.4-4): Mark as Multi-Arch: same.


=====================================
debian/rules
=====================================
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile-gmake -*-
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export DEB_LDFLAGS_MAINT_APPEND = -fvisibility=hidden
@@ -15,12 +12,6 @@ export DEB_CXXFLAGS_MAINT_APPEND = -Wno-deprecated-declarations \
                                      -Wno-unused-result -Wno-attributes
 endif
 
-# reduce debug info to fix FTBFS on archs with low address space
-ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
-  export DEB_CFLAGS_MAINT_APPEND = -g1
-  export DEB_CXXFLAGS_MAINT_APPEND = -g1
-endif
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -48,6 +39,13 @@ override_dh_auto_configure:
 	-DMIA_CREATE_NIPYPE_INTERFACES=OFF \
 	-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=OFF
 
+# Skip a test which fails only on Salsa CI, probably due to some
+# limitations of the environment.
+ifdef SALSA_BUILD
+override_dh_auto_test:
+	dh_auto_test -- ARGS\+="--exclude-regex cmdlineparseroutput"
+endif
+
 # dh_strip detects executable files, so make *.mia files executable then strip then
 # remove the executable flag
 override_dh_strip:



View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/4c49abb366a538f789efa66540429da4f8d96a3a...4525398cec2c499f0d2576ddcb18c5ef3175968b

-- 
View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/4c49abb366a538f789efa66540429da4f8d96a3a...4525398cec2c499f0d2576ddcb18c5ef3175968b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251018/c45e858e/attachment-0001.htm>