summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rwxr-xr-xscripts/check-qemu-install8
2 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8be32d19..86452bd7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,21 @@ test: checkiso
.PHONY: test-no-interfaces
.ONESHELL:
test-no-interfaces: checkiso
+<<<<<<< HEAD
scripts/check-qemu-install --debug --no-interfaces build/live-image-amd64.hybrid.iso
.PHONY: testd
.ONESHELL:
testd: checkiso
scripts/check-qemu-install --debug --configd 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
+>>>>>>> 57d5afe0 (Testsuite: T6494: add new make target "test-interfaces")
.PHONY: testc
.ONESHELL:
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index ed1b6dff..b36f1ce3 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -479,6 +479,14 @@ try:
elif not args.configtest:
# run default smoketest suite
+<<<<<<< HEAD
+=======
+ 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 -maxdepth 2 -type f -name test_* ! \( {match_str} \) -delete')
+ c.expect(op_mode_prompt)
+>>>>>>> 57d5afe0 (Testsuite: T6494: add new make target "test-interfaces")
if args.no_interfaces:
# remove interface tests as they consume a lot of time
c.sendline('sudo rm -f /usr/libexec/vyos/tests/smoke/cli/test_interfaces_*')