summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 21:48:05 +0200
committerGitHub <noreply@github.com>2024-10-06 21:48:05 +0200
commitbeb5d83003fe54071bff044a3442c64c56f3c49c (patch)
tree9f38c92c0aa0c7b2243826153f4f6c466229739c
parenteb8e689e38300284f89c80284209343ac5b6cc10 (diff)
parent57d5afe0ff6623d63f014d277246b14a1f12f62c (diff)
downloadvyos-build-beb5d83003fe54071bff044a3442c64c56f3c49c.tar.gz
vyos-build-beb5d83003fe54071bff044a3442c64c56f3c49c.zip
Merge pull request #796 from c-po/smoketests
Testsuite: T6494: add new make target "test-interfaces"
-rw-r--r--Makefile7
-rwxr-xr-xscripts/check-qemu-install2
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2ff776c0..f5a31bb3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,12 @@ test: checkiso
.PHONY: test-no-interfaces
.ONESHELL:
test-no-interfaces: checkiso
- scripts/check-qemu-install --debug --configd --match="$(MATCH)" --smoketest --uefi --no-interfaces build/live-image-amd64.hybrid.iso
+ scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces build/live-image-amd64.hybrid.iso
+
+.PHONY: test-interfaces
+.ONESHELL:
+test-interfaces: checkiso
+ scripts/check-qemu-install --debug --configd --match="interfaces_" --smoketest --uefi build/live-image-amd64.hybrid.iso
.PHONY: testc
.ONESHELL:
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 21084655..8d65f8b2 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -760,7 +760,7 @@ try:
if args.match:
# Remove tests that we don't want to run
match_str = '-o '.join([f'-name "test_*{name}*.py" ' for name in args.match.split("|")]).strip()
- c.sendline(f'sudo find /usr/libexec/vyos/tests/smoke/cli/test_* -type f ! \( {match_str} \) -delete')
+ c.sendline(f'sudo find /usr/libexec/vyos/tests/smoke -maxdepth 2 -type f -name test_* ! \( {match_str} \) -delete')
c.expect(op_mode_prompt)
if args.no_interfaces:
# remove interface tests as they consume a lot of time