Skip to content

Commit

Permalink
Testsuite: T6494: add new make target "test-interfaces"
Browse files Browse the repository at this point in the history
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 57d5afe)

# Conflicts:
#	Makefile
  • Loading branch information
c-po authored and mergify[bot] committed Oct 8, 2024
1 parent 3f7aa41 commit c5c9b80
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,16 @@ test: checkiso
.PHONY: test-no-interfaces
.ONESHELL:
test-no-interfaces: checkiso
<<<<<<< HEAD
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
>>>>>>> 57d5afe0 (Testsuite: T6494: add new make target "test-interfaces")

.PHONY: testc
.ONESHELL:
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-qemu-install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c5c9b80

Please sign in to comment.