From 0ff0454c59ae79d47fadcc4f2837e3bfca7af105 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Jun 2013 18:00:24 +0100 Subject: [PATCH] tests: inspection: Don't complain because NTFS UUID changes between test runs. This fixes commit a86cb71fcadbed3881e593b6de9706c03ca57149. --- inspector/test-virt-inspector.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inspector/test-virt-inspector.sh b/inspector/test-virt-inspector.sh index c8dd37242..c0b2a5e0b 100755 --- a/inspector/test-virt-inspector.sh +++ b/inspector/test-virt-inspector.sh @@ -18,6 +18,10 @@ export LANG=C set -e +set -x + +# ntfs-3g can't set UUIDs right now, so ignore just that . +diff_ignore="-I [0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]" for f in ../tests/guests/{debian,fedora,ubuntu,windows}.img; do # Ignore zero-sized windows.img if ntfs-3g is not installed. @@ -26,7 +30,7 @@ for f in ../tests/guests/{debian,fedora,ubuntu,windows}.img; do $VG ./virt-inspector -a "$f" > "actual-$b.xml" # This 'diff' command will fail (because of -e option) if there # are any differences. - diff -ur "expected-$b.xml" "actual-$b.xml" + diff -ur $diff_ignore "expected-$b.xml" "actual-$b.xml" fi done