From d411807ff46fa6faf8410d994c2f39520b8fc2dc Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 16 Dec 2019 13:36:12 -0500 Subject: [PATCH 16/37] test: check-container: also run check-integration This ties the integration tests into the "check-container" target. NOTE: We force "-j1" because the integration tests must be run serially. (cherry picked from commit c1c8156e267d3680959d9bc8ac092d829bac6719) (cherry picked from commit fbfc230ed2c2082d0e55b25e551ebc241f7efdf2) --- src/tests/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index c00c198bf9bb..bf028c7c5389 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -55,12 +55,13 @@ check-container-debian-sid: xsltproc docbook-xsl docbook-xml iptables ipset ebtables \ nftables libxml2-utils libdbus-1-dev libgirepository1.0-dev \ python3-dbus python3-gi python3-slip-dbus python3-nftables \ - procps && \ + procps network-manager gir1.2-nm-1.0 && \ apt-get install -y libnftables-dev && \ ./autogen.sh && \ ./configure PYTHON=/usr/bin/python3 && \ make && \ - make -C src/tests check-local TESTSUITEFLAGS=\"$(TESTSUITEFLAGS)\" " + make -C src/tests check-local TESTSUITEFLAGS=\"$(TESTSUITEFLAGS)\" && \ + make -C src/tests check-integration TESTSUITEFLAGS=\"$(TESTSUITEFLAGS) -j1\" " check-container-fedora-rawhide: (cd $(abs_top_srcdir) && tar -c . ) | \ @@ -71,12 +72,14 @@ check-container-fedora-rawhide: docbook-style-xsl file gettext glib2-devel intltool ipset \ iptables iptables-nft libtool libxml2 libxslt make nftables \ python3-nftables python3-slip-dbus python3-gobject-base \ - diffutils procps-ng iproute which dbus-daemon && \ + diffutils procps-ng iproute which dbus-daemon \ + NetworkManager && \ alternatives --set ebtables /usr/sbin/ebtables-nft && \ ./autogen.sh && \ ./configure PYTHON=/usr/bin/python3 && \ make && \ - make -C src/tests check-local TESTSUITEFLAGS=\"$(TESTSUITEFLAGS)\" " + make -C src/tests check-local TESTSUITEFLAGS=\"$(TESTSUITEFLAGS)\" && \ + make -C src/tests check-integration TESTSUITEFLAGS=\"$(TESTSUITEFLAGS) -j1\" " check-container: check-container-debian-sid check-container: check-container-fedora-rawhide -- 2.23.0