[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 3 commits: rules: Decrease timeout for tests to 5m

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
2a7b4f4a by Andrea Bolognani at 2020-09-16T22:21:51+02:00
rules: Decrease timeout for tests to 5m

The longest a single test program currently takes to complete
is around 1m, so 5m is a more adequate timeout than 15m.

- - - - -
6337ea23 by Andrea Bolognani at 2020-10-14T01:10:24+02:00
rules: Make dh_missing errors non-fatal for -indep builds

dh_missing is smart enough to figure out that files that are part
of packages that are not being built, such as -arch packages
during an -indep build, are not to be reported, but of course we
can't expect it to go as far as inspecting debian/rules and
realize that some files have been skipped on purpose.

This hasn't caused any issues so far, but after switching to
debhelper compat 13 with a9cc391d8ec9 dh_missing's default has
changed to --fail-missing, and as a consequence of that -indep
builds are failing. Let's go back to --list-missing for those.

- - - - -
1a3e3059 by Andrea Bolognani at 2020-10-14T01:12:47+02:00
Document changes and release 6.7.0-3

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt (6.7.0-3) experimental; urgency=medium
+
+  * Team upload
+
+  * [2a7b4f4] rules: Decrease timeout for tests to 5m
+  * [6337ea2] rules: Make dh_missing errors non-fatal for -indep builds
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Sun, 11 Oct 2020 16:29:18 +0200
+
 libvirt (6.7.0-2) experimental; urgency=medium
 
   * [7b7ff73] patches: Add backport/[...]gluster-module-dep.patch


=====================================
debian/rules
=====================================
@@ -156,12 +156,12 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
 
 # The default timeout for tests in Meson is 30s, which is not enough
-# for architectures with slow buildds: make the timeout 30 times
-# larger (15m) to account for those
+# for architectures with slow buildds: make the timeout 10 times
+# larger (5m) to account for those
 override_dh_auto_test:
 	export LD_PRELOAD=""; \
 	export VIR_TEST_DEBUG=1; \
-	if ! dh_auto_test -- --timeout-multiplier 30; then \
+	if ! dh_auto_test -- --timeout-multiplier 10; then \
 	    cat $(DEB_BUILDDIR)/meson-logs/testlog.txt; \
 	    exit 1; \
 	fi
@@ -269,3 +269,10 @@ override_dh_auto_clean:
 	      $(CURDIR)/debian/libvirt-daemon-system.virtlogd.default \
 	      $(CURDIR)/debian/libvirt-daemon-system.virtlockd.default \
 	      $(NULL)
+
+# dh_missing can't figure out that some files are skipped on purpose due
+# to the conditionals above, so let's make the error non-fatal for -indep
+# builds. -arch builds don't need this because we sync whether each feature
+# is enabled and whether the corresponding files are installed
+override_dh_missing-indep:
+	dh_missing --list-missing



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d21edffd747c1da1fdea54821037d79d8d4275f4...1a3e3059d129d22c8e2004c55b381138ce9ff59b

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d21edffd747c1da1fdea54821037d79d8d4275f4...1a3e3059d129d22c8e2004c55b381138ce9ff59b
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/pkg-libvirt-commits/attachments/20201014/178a37d6/attachment-0001.html>