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