summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-15 15:15:41 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-15 15:15:41 +0200
commit19778c23a054228dd889b6ac95dc17079eb7354a (patch)
treeb0a4ff1e0af889bb61467a869a134ffac763405f
parent0f8a2d5e61c7394a12ada65cb462c2edaf5dd7d5 (diff)
downloadvyos-build-19778c23a054228dd889b6ac95dc17079eb7354a.tar.gz
vyos-build-19778c23a054228dd889b6ac95dc17079eb7354a.zip
Makefile: add "make test-no-interfaces" to start smoketests w/o interface tests
-rw-r--r--Makefile9
-rwxr-xr-xscripts/check-qemu-install8
2 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3defd020..1bf71603 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,15 @@ test:
fi
scripts/check-qemu-install --debug build/live-image-amd64.hybrid.iso
+.PHONY: test
+.ONESHELL:
+test-no-interfaces:
+ if [ ! -f build/live-image-amd64.hybrid.iso ]; then
+ echo "Could not find build/live-image-amd64.hybrid.iso"
+ exit 1
+ fi
+ scripts/check-qemu-install --debug --no-interfaces build/live-image-amd64.hybrid.iso
+
.PHONY: testd
.ONESHELL:
testd:
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 1a4718a2..d50b2a86 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -72,6 +72,9 @@ parser.add_argument('--no-kvm', help='Disable use of kvm',
parser.add_argument('--configd', help='Execute testsuite with config daemon',
action='store_true',
default=False)
+parser.add_argument('--no-interfaces', help='Execute testsuite without interface tests to save time',
+ action='store_true',
+ default=False)
parser.add_argument('--configtest', help='Execute load/commit config tests',
action='store_true',
default=False)
@@ -332,6 +335,11 @@ try:
# run default smoketest suite
if not args.configtest:
+ 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_*')
+ c.expect(op_mode_prompt)
+
log.info('Executing VyOS smoketests')
c.sendline('/usr/bin/vyos-smoketest')
i = c.expect(['\n +Invalid command:', '\n +Set failed',