From c0b7dd2e9bc03b2ba19633acb67c033393397854 Mon Sep 17 00:00:00 2001 From: Simon McVittie <simon.mcvittie@collabora.co.uk> Date: Tue, 19 Jul 2016 19:18:18 +0100 Subject: [PATCH] firewall: run test from source directory As with many previous commits, there's no point in installing this simple script; running it from the git directory gives us faster fix/test cycles. Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Differential Revision: https://phabricator.apertis.org/D3766 --- Makefile | 1 + common/firewall.yaml | 6 +----- debian/apertis-tests.install | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bbde37b..0e40bc0 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ COPY = \ clutter \ common \ dbus \ + firewall \ folks \ grilo \ inherit-config.sh \ diff --git a/common/firewall.yaml b/common/firewall.yaml index 7764602..a4385c9 100644 --- a/common/firewall.yaml +++ b/common/firewall.yaml @@ -10,13 +10,9 @@ metadata: environment: - lava-test-shell -install: - deps: - - chaiwala-tests - run: steps: - - common/run-test-in-systemd --timeout=900 --name=run-test env DEBUG=2 /usr/share/chaiwala-tests/firewall/automated/run-test.sh + - common/run-test-in-systemd --timeout=900 --name=run-test env DEBUG=2 firewall/automated/run-test.sh parse: pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$ diff --git a/debian/apertis-tests.install b/debian/apertis-tests.install index 818475a..11f4eca 100644 --- a/debian/apertis-tests.install +++ b/debian/apertis-tests.install @@ -12,6 +12,7 @@ usr/lib/apertis-tests/clutter usr/lib/apertis-tests/common usr/lib/apertis-tests/dbus usr/lib/apertis-tests/grilo +usr/lib/apertis-tests/firewall usr/lib/apertis-tests/folks usr/lib/apertis-tests/inherit-config.sh usr/lib/apertis-tests/libreoffice -- GitLab