diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-10-06 22:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-10-06 22:00:11 +0200 |
| commit | 218a80459daa797280eb1624d0ff90c599e369bc (patch) | |
| tree | 9bf6c200e47bc8f1522063114764cb4a9ecc32f3 | |
| parent | e3e1fc6b0197d1155b01025674cbad8189af153f (diff) | |
| parent | beb5d83003fe54071bff044a3442c64c56f3c49c (diff) | |
| download | vyos-build-218a80459daa797280eb1624d0ff90c599e369bc.tar.gz vyos-build-218a80459daa797280eb1624d0ff90c599e369bc.zip | |
Merge branch 'vyos:current' into current
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | packages/.gitignore | 7 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -26,7 +26,12 @@ test: checkiso .PHONY: test-no-interfaces .ONESHELL: test-no-interfaces: checkiso - scripts/check-qemu-install --debug --configd --match="$(MATCH)" --smoketest --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/packages/.gitignore b/packages/.gitignore index db1547bf..33662f55 100644 --- a/packages/.gitignore +++ b/packages/.gitignore @@ -1,6 +1 @@ -*.tar.gz -*.deb -*.dsc -*.buildinfo -*.changes -*.git +/* diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 313e04f1..d5edae4f 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -781,7 +781,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 |