diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-06 16:10:04 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-10-09 21:38:07 +0200 |
| commit | d9f88f93a99eaab0730a4da4afd4d4c5b5d4113a (patch) | |
| tree | 217783b6b47f75a278b9e84129ad97ccf0981f06 | |
| parent | 3f7aa4122b492eb25a0f227687b40a9e821b54f5 (diff) | |
| download | vyos-build-d9f88f93a99eaab0730a4da4afd4d4c5b5d4113a.tar.gz vyos-build-d9f88f93a99eaab0730a4da4afd4d4c5b5d4113a.zip | |
Testsuite: T6494: add new make target "test-interfaces"mergify/bp/circinus/pr-796
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)
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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 ea3aef63..050fa859 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 |