From fecc74e080aa89bc1f4f07b815792c1998edf48f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Apr 2013 16:11:32 +0100 Subject: [PATCH] tests: sysprep: Specify list of operations explicitly. This commit makes no functional change on its own, but it allows us to filter out failing operations on Ubuntu. --- sysprep/test-virt-sysprep.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sysprep/test-virt-sysprep.sh b/sysprep/test-virt-sysprep.sh index 4986aa07f..7c4660a24 100755 --- a/sysprep/test-virt-sysprep.sh +++ b/sysprep/test-virt-sysprep.sh @@ -19,13 +19,22 @@ export LANG=C set -e +# Get a comma-separated list of the enabled-by-default operations. +operations=$( + ./virt-sysprep --list-operations | + fgrep '*' | + awk '{printf ("%s,",$1)}' | + sed 's/,$//' +) +echo operations=$operations + # virt-sysprep with the -n option doesn't modify the guest. It ought # to be able to sysprep any of our test guests. for f in ../tests/guests/{debian,fedora,ubuntu,windows}.img; do # Ignore zero-sized windows.img if ntfs-3g is not installed. if [ -s "$f" ]; then - $VG ./virt-sysprep -q -n -a $f + $VG ./virt-sysprep -q -n --enable "$operations" -a $f fi done