summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-10-29 08:30:51 +0200
committerLars Wirzenius <liw@liw.fi>2020-10-29 08:30:51 +0200
commitc9a76219554e5e875d5e1342bfcb9b505e5d1da9 (patch)
tree71b7b4919a7bf8a778df438c9161ce25e5c09225
parent670c36b402d445e2529e14d3048afcbbf33a1c03 (diff)
downloadvmdb2-c9a76219554e5e875d5e1342bfcb9b505e5d1da9.tar.gz
test: make sure smoke.sh is run in check-all; fix it to work
smoke.sh was failing, because it indirectly invoked vmdb2 with the now-removed option --no-default-config. Thanks: David Edmondson
-rwxr-xr-xcheck-all2
-rw-r--r--smoke.yarn2
2 files changed, 3 insertions, 1 deletions
diff --git a/check-all b/check-all
index 38e4ee8..fb6fc4a 100755
--- a/check-all
+++ b/check-all
@@ -25,6 +25,8 @@ cd "$src"
#tryit luks.img "$src/luks.vmdb"
#tryit lvm2.img "$src/lvm2.vmdb"; exit
+./smoke.sh "$tarball"
+
for x in "$@" pc uefi ansible smoke-pc smoke-uefi
do
tryit "$dst/$x.img" "$x.vmdb"
diff --git a/smoke.yarn b/smoke.yarn
index c0a7499..456253f 100644
--- a/smoke.yarn
+++ b/smoke.yarn
@@ -29,7 +29,7 @@ testing multiple time much faster.
THEN user can UEFI boot smoke-uefi.img and power it off from root shell
IMPLEMENTS WHEN user runs vmdb (\S+) --output (\S+)
- "$SRCDIR/vmdb2" --no-default-config "$SRCDIR/$MATCH_1" \
+ "$SRCDIR/vmdb2" "$SRCDIR/$MATCH_1" \
--output "$DATADIR/$MATCH_2" \
--log "$DATADIR/vmdb.log" \
--verbose \