From d9f88f93a99eaab0730a4da4afd4d4c5b5d4113a Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 6 Oct 2024 16:10:04 +0200 Subject: [PATCH] Testsuite: T6494: add new make target "test-interfaces" We can not run the interface related tests, and non interface related testcases in parallel to speedup the entire build process. (cherry picked from commit 57d5afe0ff6623d63f014d277246b14a1f12f62c) --- Makefile | 7 ++++++- scripts/check-qemu-install | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 48225d6c9f..f49637f73b 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)" --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 ea3aef6310..050fa85985 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -651,7 +651,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