diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-06 16:10:04 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-10-08 20:01:50 +0000 |
| commit | bff0271aba4982c006d540a0f71899d8fff9b73a (patch) | |
| tree | 3ad80bedec69410860ac8dfa98ae4dcf4bcab2d2 | |
| parent | d31fd38f581f19a35e3a13470dc822969fca89c7 (diff) | |
| download | vyos-build-mergify/bp/sagitta/pr-796.tar.gz vyos-build-mergify/bp/sagitta/pr-796.zip | |
Testsuite: T6494: add new make target "test-interfaces"mergify/bp/sagitta/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)
# Conflicts:
# Makefile
# scripts/check-qemu-install
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 8 |
2 files changed, 17 insertions, 0 deletions
@@ -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_*') |