[Pkg-libvirt-commits] [Git][libvirt-team/osinfo-db][debian/sid] 9 commits: Group common make args in variable

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / osinfo-db


Commits:
a0511a7a by Pino Toscano at 2020-07-18T16:57:27+02:00
Group common make args in variable

- - - - -
65b82901 by Pino Toscano at 2020-07-18T17:06:50+02:00
Use parallel jobs if requested

- - - - -
5c1c05c1 by Pino Toscano at 2020-07-18T17:22:06+02:00
Add the locales-all build dependency

It will be needed to have the en_US.UTF-8 locale.

- - - - -
03a7a994 by Pino Toscano at 2020-07-18T17:26:02+02:00
Annotate the test build dependencies as !nocheck

- - - - -
31e84308 by Pino Toscano at 2020-07-18T17:26:40+02:00
Remove the unused libxml2-utils build dependency

- - - - -
27c55329 by Pino Toscano at 2020-07-18T17:27:55+02:00
Run the upstream test suite at build time

VPATH test suite runs were fixed many months ago.

- - - - -
ec13454b by Pino Toscano at 2020-07-18T17:30:08+02:00
test-installscript autopkgtest: test also Debian 10 and testing

- - - - -
38d5128e by Pino Toscano at 2020-07-18T17:33:21+02:00
Add a new testsuite autopkgtest

It runs the upstream test suite on the installed osinfo-db.

- - - - -
cb18080e by Guido Günther at 2020-08-10T12:06:10+00:00
Merge branch 'more-tests' into 'debian/sid'

Run more tests

See merge request libvirt-team/osinfo-db!6
- - - - -


5 changed files:

- debian/control
- debian/rules
- debian/tests/control
- debian/tests/test-installscript
- + debian/tests/testsuite


Changes:

=====================================
debian/control
=====================================
@@ -5,10 +5,10 @@ Maintainer: Guido Günther <agx at sigxcpu.org>
 Build-Depends:
  debhelper-compat (= 12),
  intltool,
- libxml2-utils,
+ locales-all <!nocheck>,
  osinfo-db-tools,
- python3-lxml,
- python3-pytest,
+ python3-lxml <!nocheck>,
+ python3-pytest <!nocheck>,
 Standards-Version: 4.2.1
 Homepage: https://libosinfo.org/
 Vcs-Git: https://salsa.debian.org/libvirt-team/osinfo-db.git


=====================================
debian/rules
=====================================
@@ -3,19 +3,28 @@
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 
+COMMON_MAKE_ARGS = -f ../Makefile VPATH=..
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+COMMON_MAKE_ARGS += -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
 %:
 	dh $@
 
 override_dh_auto_build:
 	mkdir build
-	make -C build -f ../Makefile VPATH=.. ARCHIVE=osinfo-db.tar.xz
+	make -C build $(COMMON_MAKE_ARGS) ARCHIVE=osinfo-db.tar.xz
 	
 override_dh_auto_clean:
 	rm -rf build
 	dh_auto_clean
 
 override_dh_auto_test:
-	@echo "Checks disabled due to https://gitlab.com/libosinfo/osinfo-db/issues/25"
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	make -C build $(COMMON_MAKE_ARGS) check
+else
+	@echo "Checks disabled via DEB_BUILD_OPTIONS"
+endif
 
 override_dh_auto_install:
 	osinfo-db-import \


=====================================
debian/tests/control
=====================================
@@ -4,3 +4,6 @@ Restrictions: allow-stderr
 
 Tests: test-installscript
 Depends: @, libosinfo-bin
+
+Tests: testsuite
+Depends: @, locales-all, python3-lxml, python3-pytest


=====================================
debian/tests/test-installscript
=====================================
@@ -2,7 +2,7 @@
 
 set -e
 
-for r in $(seq 6 9); do
+for r in $(seq 6 10) testing; do
     DEB="debian${r}"
     osinfo-install-script "${DEB}"
     if [ -f preseed.cfg ]; then


=====================================
debian/tests/testsuite
=====================================
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+INTERNAL_OSINFO_DB_DATA_DIR=/usr/share/osinfo python3 -m pytest tests



View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/compare/e26fe1394557861bd98230944866a41d19013c04...cb18080e10f8a1ae91358f2ea8887df109dc220b

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/osinfo-db/-/compare/e26fe1394557861bd98230944866a41d19013c04...cb18080e10f8a1ae91358f2ea8887df109dc220b
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/20200810/db72e67a/attachment-0001.html>